Skip to content

1029 update version number to 51 #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

1029 update version number to 51 #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f0a6ef1
Bump version from 5.0 to 5.1
vb2ae Nov 17, 2025
79f84c9
Update version.json
vb2ae Nov 17, 2025
4ad2d88
Update version from 5.0-beta to 5.1-beta
vb2ae Nov 17, 2025
33318a6
Update version.json
vb2ae Nov 17, 2025
d426c42
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
973eabf
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
6cbb9d7
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
e7ca1f0
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
7c19915
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
23fe4f5
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
b5ec43a
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
52201cc
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
1939dd3
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
4224f3b
Update Nerdbank.GitVersioning package version
vb2ae Nov 17, 2025
02444be
Update Microsoft.WindowsAppSDK and add package updates
vb2ae Nov 17, 2025
9070923
Update test dependencies and project configurations
vb2ae Nov 17, 2025
7862947
Update SDK version from 9.0.x to 10.0.x
vb2ae Nov 18, 2025
7f4d80f
Add net10.0 target framework to project
vb2ae Nov 18, 2025
79ed314
Update target framework to net10.0
vb2ae Nov 18, 2025
941dfb0
Change TargetFramework to TargetFrameworks
vb2ae Nov 18, 2025
3a1b76a
Update target framework to net10.0-windows
vb2ae Nov 18, 2025
5d220df
Upgrade target framework from net8.0 to net10.0
vb2ae Nov 18, 2025
19d2607
Update target framework to net8.0-windows
vb2ae Nov 18, 2025
c5c6bc5
Upgrade .NET SDK version from 9.0.x to 10.0.x
vb2ae Nov 18, 2025
2797924
Add net10.0-windows target framework support
vb2ae Nov 18, 2025
d5c9b00
Update Caliburn.Micro.Platform.csproj
vb2ae Nov 18, 2025
25a5f0b
Update msbuild setup in dotnet.yml
vb2ae Nov 18, 2025
e796f8d
Update MSBuild version range in dotnet.yml
vb2ae Nov 18, 2025
c46ec9c
Refactor workflow to use dotnet msbuild commands
vb2ae Nov 18, 2025
2103205
Update dotnet.yml to use msbuild instead of dotnet
vb2ae Nov 18, 2025
e072e8c
Update target framework from net462 to net472
vb2ae Nov 18, 2025
a98d61e
fix build
vb2ae Nov 19, 2025
64c3b8b
Merge branch '1029-update-version-number-to-51' of https://github.com…
vb2ae Nov 19, 2025
5efe61c
remove msbuild
vb2ae Nov 19, 2025
d67ede2
build fix?
vb2ae Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
jobs:
analyse:
name: Analyse
runs-on: windows-2022
runs-on: windows-latest
permissions:
# required for all workflows
security-events: write
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
jobs:
build:

runs-on: windows-2022
runs-on: windows-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -44,7 +44,8 @@ jobs:
uses: NuGet/setup-nuget@v2
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2

with:
vs-prerelease: true
- name: search workloads
run: dotnet workload search
- name: restore workloads
Expand All @@ -68,16 +69,16 @@ jobs:
run: msbuild ${{env.caliburn_tutorial}} -t:restore

- name: Build feature tutorial
run: msbuild ${{env.caliburn_tutorial}} /t:Build /p:Configuration=${{env.build_configuration}}
run: msbuild ${{env.caliburn_tutorial}} /t:Build /p:Configuration=${{env.build_configuration}}

- name: Restore nuget packages for features
run: msbuild ${{env.caliburn_features}} -t:restore

- name: Build feature features
run: msbuild ${{env.caliburn_features}} /t:Build /p:Configuration=Debug
run: msbuild ${{env.caliburn_features}} /t:Build /p:Configuration=Debug

- name: Pack Nuget
run: msbuild ${{env.caliburn_sln}} /t:package /p:Configuration=${{env.build_configuration}}
run: msbuild ${{env.caliburn_sln}} /t:package /p:Configuration=${{env.build_configuration}}

- name: publish Nuget Packages to GitHub
run: dotnet nuget push ${{env.nuget_upload}} --source ${{env.package_feed}} --api-key ${{secrets.PUBLISH_NUGET_PACKAGE}} --skip-duplicate
Expand Down
2 changes: 1 addition & 1 deletion azure-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
displayName: 'Install .NET'
inputs:
packageType: 'sdk'
version: '9.0.x'
version: '10.0.x'


- task: PowerShell@2
Expand Down
2 changes: 1 addition & 1 deletion samples/features/Features.Avalonia/Features.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>10</LangVersion>
<AvaloniaNameGeneratorIsEnabled>false</AvaloniaNameGeneratorIsEnabled>
Expand Down
10 changes: 5 additions & 5 deletions src/Caliburn.Micro.Avalonia.Tests/Caliburn.Micro.Avalonia.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -15,11 +15,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
<PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.2" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -41,7 +41,7 @@


<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Caliburn.Micro.Avalonia/Caliburn.Micro.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<PackageId>Caliburn.Micro.Avalonia</PackageId>
<Product>Caliburn.Micro</Product>
<RootNamespace>Caliburn.Micro</RootNamespace>
Expand Down Expand Up @@ -77,7 +77,7 @@

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

<Target Name="IncludeProjectReferencesWithPrivateAssetsAttributeInPackage"
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Avalonia/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "5.0-beta",
"version": "5.1-beta",
"nugetPackageVersion": {
"semVer": 2
},
Expand Down
10 changes: 5 additions & 5 deletions src/Caliburn.Micro.Core.Tests/Caliburn.Micro.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Caliburn.Micro.Maui.Tests/Caliburn.Micro.Maui.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -37,7 +37,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Maui/Caliburn.Micro.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="$(AssemblyName).Tests" />
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Maui/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "5.0-beta",
"version": "5.1-beta",
"nugetPackageVersion": {
"semVer": 2
},
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Platform.Core/Caliburn.Micro.Platform.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/Caliburn.Micro.Platform.Tests/Caliburn.Micro.Platform.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -38,7 +38,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
</Project>
10 changes: 7 additions & 3 deletions src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFrameworks>net462;uap10.0.19041;net9.0-android;net9.0-ios;net8.0-windows;net9.0-windows</TargetFrameworks>
<TargetFrameworks>net472;uap10.0.19041;net9.0-android;net9.0-ios;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
<PackageId>Caliburn.Micro</PackageId>
<Product>Caliburn.Micro</Product>
<RootNamespace>Caliburn.Micro</RootNamespace>
Expand Down Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<PropertyGroup>
<LangVersion>9.0</LangVersion>
<LangVersion>latest</LangVersion>
<Title>Caliburn Micro for WPF, UWP, iOS, and Android</Title>
<PackageIcon>CaliburnIcon.png</PackageIcon>
</PropertyGroup>
Expand All @@ -54,6 +54,10 @@
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<Compile Include="Platforms\net46-netcore\**\*.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0-windows'">
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<Compile Include="Platforms\net46-netcore\**\*.cs" />
</ItemGroup>

<ItemGroup Label="Package">
<None Include="..\..\CaliburnIcon.png">
Expand Down Expand Up @@ -83,7 +87,7 @@

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 8 additions & 4 deletions src/Caliburn.Micro.WinUI3/Caliburn.Micro.WinUI3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
<TargetFrameworks>net8.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>Caliburn.Micro</RootNamespace>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
Expand Down Expand Up @@ -41,7 +41,7 @@

</ItemGroup>

<ItemGroup >
<ItemGroup>
<Compile Remove="*.cs" />
<Compile Include="..\Caliburn.Micro.Platform\Platforms\uap\**\*.cs" />
</ItemGroup>
Expand All @@ -64,9 +64,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.220902.1-preview1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />

</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Xamarin.Forms/Caliburn.Micro.Xamarin.Forms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.9.50" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.x",
"version": "10.0.x",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
Expand Down
4 changes: 2 additions & 2 deletions version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
a{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "5.0",
"version": "5.1-beta",
"nugetPackageVersion": {
"semVer": 2
},
Expand Down
Loading