Skip to content

Commit e93c923

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/sdk@1efe473357 9.0.100-rtm.24521.19 (#9443)
Changes: dotnet/sdk@5b9d9d4...1efe473 Changes: dotnet/runtime@226c034...197db4f Changes: dotnet/emsdk@8e660ff...8be5676 Updates: * Microsoft.NET.Sdk: from 9.0.100-rtm.24512.1 to 9.0.100-rtm.24521.19 * Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24510.3 to 9.0.0 * Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100: from 9.0.0-rtm.24469.1 to 9.0.0 * Microsoft.NET.ILLink: from 9.0.0-rtm.24510.3 to 9.0.0 ~~ Other changes ~~ I had to patch up some dependency names that changed, based on stable branding for .NET runtime 9.0.0: * `Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport` -> `Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100` * `Microsoft.NET.ILLink.Tasks` -> `Microsoft.NET.ILLink` Next, I decoupled the dotnet/runtime version from dotnet/sdk by removing: CoherentParentDependency="Microsoft.NET.Sdk" Going forward, we will have a direct subscription for runtime such as: darc add-subscription --channel ".NET 9" --target-branch "release/9.0.1xx" --source-repo https://github.com/dotnet/runtime --target-repo https://github.com/dotnet/android Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 61a7677 commit e93c923

File tree

4 files changed

+25
-15
lines changed

4 files changed

+25
-15
lines changed

‎NuGet.config

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-android -->
7-
<add key="darc-pub-dotnet-android-df9aaf2-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-df9aaf29-1/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-android-df9aaf2-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-df9aaf29-2/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-android -->
9+
<!-- Begin: Package sources from dotnet-emsdk -->
10+
<add key="darc-pub-dotnet-emsdk-8be5676" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-8be5676a/nuget/v3/index.json" />
11+
<!-- End: Package sources from dotnet-emsdk -->
12+
<!-- Begin: Package sources from dotnet-runtime -->
13+
<add key="darc-pub-dotnet-runtime-197db4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-197db4ff/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-runtime -->
915
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1016
<!-- ensure only the sources defined below are used -->
1117
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />

‎eng/Version.Details.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24512.1">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24521.19">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>5b9d9d4677ea31d954533e9de2f95a3ea638135d</Sha>
5+
<Sha>1efe47335726077cc75f52ec5b00ebf243f4c048</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rtm.24510.3" CoherentParentDependency="Microsoft.NET.Sdk">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-rtm.24518.13">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>226c0347b92c4f9649bcc7ad580f74cb0409580e</Sha>
9+
<Sha>197db4ff0ded5f02e2d050f1310f297265d19e3d</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24510.3" CoherentParentDependency="Microsoft.NET.Sdk">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>226c0347b92c4f9649bcc7ad580f74cb0409580e</Sha>
13+
<Sha>197db4ff0ded5f02e2d050f1310f297265d19e3d</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rtm.24469.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
16+
<Uri>https://github.com/dotnet/runtime</Uri>
17+
<Sha>197db4ff0ded5f02e2d050f1310f297265d19e3d</Sha>
18+
</Dependency>
19+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1620
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>8e660ff41e91879977e3a9d837e068bd72234c26</Sha>
21+
<Sha>8be5676af1ccf568b258133788a24aedd1a80994</Sha>
1822
</Dependency>
1923
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24480.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2024
<Uri>https://github.com/dotnet/cecil</Uri>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>9.0.100-rtm.24512.1</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>9.0.100-rtm.24521.19</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rtm.24510.3</MicrosoftNETILLinkTasksPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rtm.24510.3</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkPackageVersion>9.0.0-rtm.24518.13</MicrosoftNETILLinkPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
99
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
10-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rtm.24469.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
11-
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
10+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
11+
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1212
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1313
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24480.1</MicrosoftDotNetCecilPackageVersion>
1414
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>

‎src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OutputPath>$(MicrosoftAndroidSdkOutDir)</OutputPath>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
10+
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkPackageVersion)" />
1111
<ProjectReference Include="..\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj" ReferenceOutputAssembly="False" />
1212

1313
<Compile Include="..\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs" Link="Profile.g.cs" />

0 commit comments

Comments
 (0)