Skip to content

Commit 0964cfc

Browse files
committed
update Uno SDK to 6.0.67 and update Uno NuGets to the versions used by that Uno SDK version
1 parent 97dc187 commit 0964cfc

File tree

7 files changed

+14
-20
lines changed

7 files changed

+14
-20
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"msbuild-sdks": {
3-
"Uno.Sdk": "5.6.54"
3+
"Uno.Sdk": "6.0.67"
44
},
55
"sdk": {
66
"version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"msbuild-sdks": {
3-
"Uno.Sdk": "5.6.54"
3+
"Uno.Sdk": "6.0.67"
44
},
55
"sdk": {
66
"version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"msbuild-sdks": {
3-
"Uno.Sdk": "5.6.54"
3+
"Uno.Sdk": "6.0.67"
44
},
55
"sdk": {
66
"version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"msbuild-sdks": {
3-
"Uno.Sdk": "5.6.54"
3+
"Uno.Sdk": "6.0.67"
44
},
55
"sdk": {
66
"version": "9.0.200",

src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545

4646
<PropertyGroup>
47-
<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios18.0;net8.0-maccatalyst18.0;net8.0-macos15.0</TargetFrameworks>
47+
<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios18.0;net8.0-maccatalyst18.0</TargetFrameworks>
4848
<RootNamespace>CSharpMarkup.WinUI.Uno.Toolkit</RootNamespace>
4949
<EnableDefaultPageItems>false</EnableDefaultPageItems>
5050
</PropertyGroup>

src/Directory.Build.props

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
<!-- For CSharpMarkup projects-->
22
<Project>
33
<PropertyGroup>
4-
<CSharpMarkupVersion>3.0.3</CSharpMarkupVersion>
5-
<CSharpMarkupReleaseTag>csharpmarkup2-winui-3-0-3</CSharpMarkupReleaseTag>
4+
<CSharpMarkupVersion>3.1.0</CSharpMarkupVersion>
5+
<CSharpMarkupReleaseTag>csharpmarkup2-winui-3-1-0</CSharpMarkupReleaseTag>
66
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
77

88
<IsUno>true</IsUno>
99

1010
<IsAndroid>false</IsAndroid>
1111
<IsIOS>false</IsIOS>
12-
<IsMac>false</IsMac>
1312
<IsMacCatalyst>false</IsMacCatalyst>
1413
<IsWinAppSdk>false</IsWinAppSdk>
1514
<IsWasm>false</IsWasm>
1615

17-
<CSharpMarkupWinUINet8TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios17.0;net8.0-maccatalyst17.0;net8.0-macos14.0</CSharpMarkupWinUINet8TargetFrameworks>
18-
<CSharpMarkupWinUINet9TargetFrameworks>net9.0-windows10.0.19041.0;net9.0;net9.0-android35.0;net9.0-ios18.0;net9.0-maccatalyst18.0;net9.0-macos15.0</CSharpMarkupWinUINet9TargetFrameworks>
16+
<CSharpMarkupWinUINet8TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios17.0;net8.0-maccatalyst17.0</CSharpMarkupWinUINet8TargetFrameworks>
17+
<CSharpMarkupWinUINet9TargetFrameworks>net9.0-windows10.0.19041.0;net9.0;net9.0-android35.0;net9.0-ios18.0;net9.0-maccatalyst18.0</CSharpMarkupWinUINet9TargetFrameworks>
1918
<CSharpMarkupWinUIExtensionsTargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8-browserwasm1.0;net8-desktop1.0;net8.0-ios18.0;net8.0-maccatalyst18.0</CSharpMarkupWinUIExtensionsTargetFrameworks>
2019
</PropertyGroup>
2120

@@ -48,11 +47,6 @@
4847
<IsIOS>true</IsIOS>
4948
</PropertyGroup>
5049
</When>
51-
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
52-
<PropertyGroup>
53-
<IsMac>true</IsMac>
54-
</PropertyGroup>
55-
</When>
5650
<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
5751
<PropertyGroup>
5852
<IsMacCatalyst>true</IsMacCatalyst>

src/Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
88
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
99
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" />
10-
<PackageVersion Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="5.2.7" />
11-
<PackageVersion Include="Uno.Extensions.Navigation.WinUI" Version="5.2.7" />
12-
<PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="5.2.7" />
13-
<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.4.6" />
14-
<PackageVersion Include="Uno.WinUI" Version="5.6.99" />
10+
<PackageVersion Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="5.3.8" />
11+
<PackageVersion Include="Uno.Extensions.Navigation.WinUI" Version="5.3.8" />
12+
<PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="5.3.8" />
13+
<PackageVersion Include="Uno.Toolkit.WinUI" Version="7.0.2" />
14+
<PackageVersion Include="Uno.WinUI" Version="6.0.465" />
1515
</ItemGroup>
1616
</Project>

0 commit comments

Comments
 (0)