Skip to content

Commit bd13b99

Browse files
Soap-141Soap-141
committed
chore!: update dotnet 10
1 parent 875a52e commit bd13b99

File tree

5 files changed

+37
-34
lines changed

5 files changed

+37
-34
lines changed

‎src/BackButtonManager.Abstractions/BackButtonManager.Abstractions.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4-
<LangVersion>12.0</LangVersion>
4+
<LangVersion>14.0</LangVersion>
55
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
66
<Authors>nventive</Authors>
77
<Company>nventive</Company>
@@ -29,11 +29,11 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
3333
</ItemGroup>
3434

3535
<ItemGroup>
3636
<!-- Needed for Source Link support -->
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
37+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3838
</ItemGroup>
3939
</Project>

‎src/BackButtonManager.Tests/BackButtonManager.Tests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>12.0</LangVersion>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<LangVersion>14.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
<AssemblyName>Chinook.BackButtonManager.Tests</AssemblyName>
88
<RootNamespace>BackButtonManager.Tests</RootNamespace>
99
<IsTestProject>True</IsTestProject>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="3.1.2">
13+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
17+
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
22-
<PackageReference Include="Moq" Version="4.18.2" />
23-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
24-
<PackageReference Include="xunit" Version="2.4.2" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
22+
<PackageReference Include="Moq" Version="4.20.72" />
23+
<PackageReference Include="FluentAssertions" Version="7.2.0" />
24+
<PackageReference Include="xunit" Version="2.9.3" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/BackButtonManager.Uno.WinUI/BackButtonManager.Uno.WinUI.csproj‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net8.0-ios;net8.0-maccatalyst;net8.0-macos;net8.0-android;net8.0-windows10.0.19041;</TargetFrameworks>
4-
<LangVersion>12.0</LangVersion>
3+
<TargetFrameworks>net10.0;net10.0-ios;net10.0-maccatalyst;net10.0-macos;net10.0-android;net10.0-windows10.0.20348;</TargetFrameworks>
4+
<LangVersion>14.0</LangVersion>
55
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
66
<GenerateLibraryLayout>true</GenerateLibraryLayout>
77
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
@@ -24,31 +24,34 @@
2424
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
29-
<ProjectReference Include="..\BackButtonManager.Abstractions\BackButtonManager.Abstractions.csproj" />
27+
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.20348'">
28+
<PackageReference Include="Uno.WinUI" Version="6.3.62" />
3029
</ItemGroup>
3130

32-
<ItemGroup>
31+
<ItemGroup >
32+
<ProjectReference Include="..\BackButtonManager.Abstractions\BackButtonManager.Abstractions.csproj" />
3333
<!-- Needed for Source Link support -->
34-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
34+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3535
</ItemGroup>
3636

37-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
38-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
39-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
40-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
41-
</ItemGroup>
37+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.20348'">
38+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
39+
<!--<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />-->
40+
</ItemGroup>
41+
42+
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.20348'">
43+
<WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
44+
</PropertyGroup>
4245

43-
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
46+
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0-windows10.0.20348'">
4447
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
4548
</PropertyGroup>
4649

47-
<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
50+
<PropertyGroup Condition="'$(TargetFramework)'=='net10.0'">
4851
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
4952
</PropertyGroup>
5053

51-
<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.19041'">
54+
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.20348'">
5255
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
5356
<Compile Update="**\*.xaml.cs">
5457
<DependentUpon>%(Filename)</DependentUpon>

‎src/BackButtonManager.Uno.WinUI/winappsdk-workaround.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project>
1+
<Project>
22
<!--
33
Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file:
44
> C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Microsoft.Common.CurrentVersion.targets(5097,5):
5-
> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net8.0-windows10.0.19041\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
5+
> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net8.0-windows10.0.20348\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
66
> [D:\a\1\s\src\Uno.Toolkit.RuntimeTests\Uno.Toolkit.RuntimeTests.WinUI.csproj]
77
Just <Import /> this file into the winui project appearing in the `[]` bracket.
88
-->

‎src/BackButtonManager/BackButtonManager.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4-
<LangVersion>12.0</LangVersion>
4+
<LangVersion>14.0</LangVersion>
55
<RootNamespace>Chinook.BackButtonManager</RootNamespace>
66
<Authors>nventive</Authors>
77
<Company>nventive</Company>
@@ -31,11 +31,11 @@
3131

3232
<ItemGroup>
3333
<ProjectReference Include="..\BackButtonManager.Abstractions\BackButtonManager.Abstractions.csproj" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
34+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
3838
<!-- Needed for Source Link support -->
39-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
39+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4040
</ItemGroup>
4141
</Project>

0 commit comments

Comments
 (0)