Skip to content
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

[release/9.0.1xx] Update to rtm and arcade net9 #25279

Merged
merged 10 commits into from
Oct 16, 2024
Merged

[release/9.0.1xx] Update to rtm and arcade net9 #25279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a25fbc1
Update to rtm
rmarinho Oct 15, 2024
f42f5fe
[ci] Move to arcade sdk net9
rmarinho Oct 15, 2024
75bf0d0
Update variables.yml
rmarinho Oct 15, 2024
618e9b0
Update NuGet.config
rmarinho Oct 15, 2024
6ac2eca
Some windows fixes
rmarinho Oct 15, 2024
5670139
Cleanup windows stuff
rmarinho Oct 16, 2024
b3a7c5e
Update Graphics.csproj
rmarinho Oct 16, 2024
1a9422a
try remove workaround
rmarinho Oct 16, 2024
57b30f7
Update Essentials.csproj
rmarinho Oct 16, 2024
5337177
try workaround for webview issue
rmarinho Oct 16, 2024
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 .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "10.0.0-prerelease.24476.1",
"version": "9.0.0-prerelease.24510.3",
"commands": [
"xharness"
]
Expand Down
5 changes: 0 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,6 @@
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
</PropertyGroup>

<!-- Windows specific settings -->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
<WindowsSdkPackageVersion>10.0.19041.44</WindowsSdkPackageVersion>
</PropertyGroup>

<!-- version number information -->
<PropertyGroup>
<!-- Default versions from the SDKs (update when there is a new TFM version) -->
Expand Down
26 changes: 20 additions & 6 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@
<Import Project="eng\NuGetVersions.targets" />

<PropertyGroup>
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
<!-- Allows for MAUI Xaml Hot Reload Samples to run without checks -->
<IgnoreMauiXamlHotReloadCompatibilityCheck>True</IgnoreMauiXamlHotReloadCompatibilityCheck>
</PropertyGroup>

<PropertyGroup>
<!-- Microsoft.Build.Msix.props" cannot be imported again -->
<!-- Found version-specific or distribution-specific runtime identifier(s)-->
<NoWarn>$(NoWarn);MSB4011;NETSDK1206</NoWarn>
</PropertyGroup>

<!-- platform version number information -->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsiOS)' == 'True'">
<SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
Expand Down Expand Up @@ -79,16 +85,24 @@
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>

<!-- Until we get net9 rtm -->
<ItemGroup Condition=" '$(_MauiTargetPlatformIsWindows)' == 'True' AND '$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
</ItemGroup>

<!--
Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
-->
<Import Project="src\Core\src\nuget\buildTransitive\WinUI.targets" Condition=" '$(WindowsPackageType)' == 'None' and '$(_MauiTargetPlatformIsWindows)' == 'True' " />

<!--
Workaround for https://github.com/MicrosoftEdge/WebView2Feedback/issues/2898
-->
<!-- Remove all 'WebView2Loader.dll' items to fix a build error -->
<Target Name="RemoveWebView2LoaderDllFromPackagingOutputs" BeforeTargets="_ComputeAppxPackagePayload">
<ItemGroup>
<WebView2LoaderDllPackagingOutput Include="@(PackagingOutputs)" Condition="'%(PackagingOutputs.Filename)%(PackagingOutputs.Extension)' == 'WebView2Loader.dll'" />
</ItemGroup>
<ItemGroup Condition="'@(WebView2LoaderDllPackagingOutput)' != ''">
<PackagingOutputs Remove="@(WebView2LoaderDllPackagingOutput)" />
</ItemGroup>
</Target>

<!-- NuGet package information -->
<PropertyGroup Condition="'$(IsPackable)' == 'true'">
<PackageTags Condition="'$(PackageTags)' == ''">$(DefaultPackageTags)</PackageTags>
Expand Down
9 changes: 3 additions & 6 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.10 -->
<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" />
<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" />
<!-- Added manually for dotnet/runtime 8.0.9 -->
<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" />
<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" />
<!-- Added manually for dotnet/runtime 8.0.11 -->
<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" />
<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" />
<!-- Added manually for .NET 8 Android -->
<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" />
<!-- Added manually for .NET 8 iOS -->
Expand Down
Loading