Skip to content

Commit

Permalink
[release/9.0.1xx-rc2] Update rc2 internal (#25013)
Browse files Browse the repository at this point in the history
* Update rc2 versions

* Update variables.yml

* Updateprivate build

* Make it coherant

* Update NuGet.config

* update

* Update DotNet.csproj

* Update versions

* Update arcade

* Update provision.yml

* Update provision.yml

* Update provision.yml

* Update provision.yml

* Update provision.yml

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24461.1+azdo.10203443

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.101 -> To Version 35.0.0-rc.2.107

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24461.1+azdo.10204821

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.107 -> To Version 35.0.0-rc.2.109

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24463.1+azdo.10221673

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.109 -> To Version 35.0.0-rc.2.111

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24469.1+azdo.10247408

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.111 -> To Version 35.0.0-rc.2.115

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24474.1+azdo.10268209

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.115 -> To Version 35.0.0-rc.2.117

* Update dependencies from https://github.com/dotnet/android build main-e885d694c51db9733305ba331519dd01df6076a4-1

Microsoft.Android.Sdk.Windows
 From Version 35.0.0-rc.2.117 -> To Version 35.0.0-rc.2.130

* Try pin windows sdk projection WindowsSdkPackageVersion

* Windows appsdk version workaround

* Provision less

* Update androdi version

* Update iOS

* update versions

* Update Versions.props

* Update NuGet.config

* Update Directory.Build.props

* Fix iOS warning

* Ignore CA1422 too

* Bump to xcode 16

* Bump xcode

* Update NewTaskSceneDelegate.cs

* Update ui-tests.yml

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
rmarinho and dotnet-maestro[bot] committed Oct 2, 2024
1 parent e11b78b commit a60b4c7
Show file tree
Hide file tree
Showing 23 changed files with 297 additions and 239 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -376,3 +376,4 @@ Directory.Build.Override.props

# Only the "snapshots" directory should be added to Git, not the "snapshots-diff" directory
snapshots-diff/
/.dotnet
26 changes: 13 additions & 13 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,26 @@
<!-- version number information -->
<PropertyGroup>
<!-- Default versions from the SDKs (update when there is a new TFM version) -->
<IosTargetFrameworkVersionSdkDefault>17.5</IosTargetFrameworkVersionSdkDefault>
<TvosTargetFrameworkVersionSdkDefault>17.5</TvosTargetFrameworkVersionSdkDefault>
<MacCatalystTargetFrameworkVersionSdkDefault>17.5</MacCatalystTargetFrameworkVersionSdkDefault>
<MacosTargetFrameworkVersionSdkDefault>14.5</MacosTargetFrameworkVersionSdkDefault>
<IosTargetFrameworkVersionSdkDefault>18.0</IosTargetFrameworkVersionSdkDefault>
<TvosTargetFrameworkVersionSdkDefault>18.0</TvosTargetFrameworkVersionSdkDefault>
<MacCatalystTargetFrameworkVersionSdkDefault>18.0</MacCatalystTargetFrameworkVersionSdkDefault>
<MacosTargetFrameworkVersionSdkDefault>15.0</MacosTargetFrameworkVersionSdkDefault>
<AndroidTargetFrameworkVersionSdkDefault>35.0</AndroidTargetFrameworkVersionSdkDefault>
<!-- Current .NET -->
<IosTargetFrameworkVersion>17.5</IosTargetFrameworkVersion>
<TvosTargetFrameworkVersion>17.5</TvosTargetFrameworkVersion>
<MacCatalystTargetFrameworkVersion>17.5</MacCatalystTargetFrameworkVersion>
<MacosTargetFrameworkVersion>14.5</MacosTargetFrameworkVersion>
<IosTargetFrameworkVersion>18.0</IosTargetFrameworkVersion>
<TvosTargetFrameworkVersion>18.0</TvosTargetFrameworkVersion>
<MacCatalystTargetFrameworkVersion>18.0</MacCatalystTargetFrameworkVersion>
<MacosTargetFrameworkVersion>15.0</MacosTargetFrameworkVersion>
<AndroidTargetFrameworkVersion>35.0</AndroidTargetFrameworkVersion>
<WindowsTargetFrameworkVersion>10.0.19041.0</WindowsTargetFrameworkVersion>
<Windows2TargetFrameworkVersion>10.0.20348.0</Windows2TargetFrameworkVersion>
<TizenTargetFrameworkVersion>7.0</TizenTargetFrameworkVersion>
<!-- Previous .NET -->
<IosPreviousTargetFrameworkVersion>17.0</IosPreviousTargetFrameworkVersion>
<TvosPreviousTargetFrameworkVersion>17.0</TvosPreviousTargetFrameworkVersion>
<MacCatalystPreviousTargetFrameworkVersion>17.0</MacCatalystPreviousTargetFrameworkVersion>
<MacosPreviousTargetFrameworkVersion>14.0</MacosPreviousTargetFrameworkVersion>
<AndroidPreviousTargetFrameworkVersion>34.0</AndroidPreviousTargetFrameworkVersion>
<IosPreviousTargetFrameworkVersion>17.5</IosPreviousTargetFrameworkVersion>
<TvosPreviousTargetFrameworkVersion>17.5</TvosPreviousTargetFrameworkVersion>
<MacCatalystPreviousTargetFrameworkVersion>17.5</MacCatalystPreviousTargetFrameworkVersion>
<MacosPreviousTargetFrameworkVersion>14.5</MacosPreviousTargetFrameworkVersion>
<AndroidPreviousTargetFrameworkVersion>35.0</AndroidPreviousTargetFrameworkVersion>
<WindowsPreviousTargetFrameworkVersion>10.0.19041.0</WindowsPreviousTargetFrameworkVersion>
<Windows2PreviousTargetFrameworkVersion>10.0.20348.0</Windows2PreviousTargetFrameworkVersion>
<TizenPreviousTargetFrameworkVersion>7.0</TizenPreviousTargetFrameworkVersion>
Expand Down
9 changes: 6 additions & 3 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,13 @@
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>

<!-- Until we get a new enough dotnet -->
<ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.31" TargetingPackVersion="10.0.19041.31" />
<!-- 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>
<PropertyGroup>
<WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>
</PropertyGroup>

<!--
Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
Expand Down
5 changes: 4 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@
<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 .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 -->
<add key="darc-pub-xamarin-xamarin-macios-bc01f5e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-bc01f5e0/nuget/v3/index.json" />
<add key="darc-pub-xamarin-xamarin-macios-a8d7eab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-a8d7eab2/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down
Loading

0 comments on commit a60b4c7

Please sign in to comment.