Skip to content

Commit 37dc2a6

Browse files
authored
[release/9.0.1xx] Update to rtm and arcade net9 (#25279)
* Update to rtm * [ci] Move to arcade sdk net9 * Update variables.yml * Update NuGet.config * Some windows fixes * Cleanup windows stuff * Update Graphics.csproj * try remove workaround * Update Essentials.csproj * try workaround for webview issue
1 parent e275d38 commit 37dc2a6

File tree

24 files changed

+237
-263
lines changed

24 files changed

+237
-263
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"microsoft.dotnet.xharness.cli": {
24-
"version": "10.0.0-prerelease.24476.1",
24+
"version": "9.0.0-prerelease.24510.3",
2525
"commands": [
2626
"xharness"
2727
]

Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@
127127
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
128128
</PropertyGroup>
129129

130-
<!-- Windows specific settings -->
131-
<PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
132-
<WindowsSdkPackageVersion>10.0.19041.44</WindowsSdkPackageVersion>
133-
</PropertyGroup>
134-
135130
<!-- version number information -->
136131
<PropertyGroup>
137132
<!-- Default versions from the SDKs (update when there is a new TFM version) -->

Directory.Build.targets

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,16 @@
1919
<Import Project="eng\NuGetVersions.targets" />
2020

2121
<PropertyGroup>
22-
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
22+
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
2323
<IgnoreMauiXamlHotReloadCompatibilityCheck>True</IgnoreMauiXamlHotReloadCompatibilityCheck>
2424
</PropertyGroup>
2525

26+
<PropertyGroup>
27+
<!-- Microsoft.Build.Msix.props" cannot be imported again -->
28+
<!-- Found version-specific or distribution-specific runtime identifier(s)-->
29+
<NoWarn>$(NoWarn);MSB4011;NETSDK1206</NoWarn>
30+
</PropertyGroup>
31+
2632
<!-- platform version number information -->
2733
<PropertyGroup Condition="'$(_MauiTargetPlatformIsiOS)' == 'True'">
2834
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
@@ -79,16 +85,24 @@
7985
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
8086
</ItemGroup>
8187

82-
<!-- Until we get net9 rtm -->
83-
<ItemGroup Condition=" '$(_MauiTargetPlatformIsWindows)' == 'True' AND '$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
84-
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
85-
</ItemGroup>
86-
8788
<!--
8889
Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
8990
-->
9091
<Import Project="src\Core\src\nuget\buildTransitive\WinUI.targets" Condition=" '$(WindowsPackageType)' == 'None' and '$(_MauiTargetPlatformIsWindows)' == 'True' " />
9192

93+
<!--
94+
Workaround for https://github.com/MicrosoftEdge/WebView2Feedback/issues/2898
95+
-->
96+
<!-- Remove all 'WebView2Loader.dll' items to fix a build error -->
97+
<Target Name="RemoveWebView2LoaderDllFromPackagingOutputs" BeforeTargets="_ComputeAppxPackagePayload">
98+
<ItemGroup>
99+
<WebView2LoaderDllPackagingOutput Include="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'WebView2Loader.dll'" />
100+
</ItemGroup>
101+
<ItemGroup Condition="'@(WebView2LoaderDllPackagingOutput)' != ''">
102+
<PackagingOutputs Remove="@(WebView2LoaderDllPackagingOutput)" />
103+
</ItemGroup>
104+
</Target>
105+
92106
<!-- NuGet package information -->
93107
<PropertyGroup Condition="'$(IsPackable)' == 'true'">
94108
<PackageTags Condition="'$(PackageTags)' == ''">$(DefaultPackageTags)</PackageTags>

NuGet.config

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@
2121
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
2222
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
2323
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
24-
<!-- Added manually for dotnet/runtime 8.0.10 -->
25-
<add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-runtime-b5f5349" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b5f53494/nuget/v3/index.json" />
27-
<!-- Added manually for dotnet/runtime 8.0.9 -->
28-
<add key="darc-pub-dotnet-emsdk-2674f58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2674f580/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-runtime-ed13b35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json" />
24+
<!-- Added manually for dotnet/runtime 8.0.11 -->
25+
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
26+
<add key="darc-pub-dotnet-runtime-ef07c4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json" />
3027
<!-- Added manually for .NET 8 Android -->
3128
<add key="darc-pub-dotnet-android-45bb7f3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-45bb7f36/nuget/v3/index.json" />
3229
<!-- Added manually for .NET 8 iOS -->

0 commit comments

Comments
 (0)