[net9.0] Update dependencies from dotnet/sdk (#21085)
This pull request updates the following dependencies
## From https://github.com/dotnet/sdk
- **Subscription**: 3727984b-7a79-4ba3-37dd-08dbe6bddf31
- **Build**: 20240914.3
- **Date Produced**: September 14, 2024 9:05:51 PM UTC
- **Commit**: 1a658dfc714a5064eea57af48d5fd68a3ffab7ef
- **Branch**: refs/heads/release/9.0.1xx
- **Updates**:
- **Microsoft.NET.Sdk**: [from 9.0.100-rc.2.24463.45 to 9.0.100-rc.2.24464.3][49]
[49]: 0f07337f8d...1a658dfc71
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
- **Coherency Updates**:
- **Microsoft.NET.ILLink.Tasks**: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24462.10 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Ref**: from 9.0.0-rc.2.24462.5 to 9.0.0-rc.2.24463.6 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Ref**: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24462.10 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Ref**: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24462.10 (parent: Microsoft.NET.Sdk)
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
3c83e65de7
Коммит
1dd6b6c4f2
|
|
@ -57,6 +57,12 @@
|
|||
<!-- Add a 8.0.8 feed -->
|
||||
<add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-runtime-2d5c0b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2d5c0b72/nuget/v3/index.json" />
|
||||
<!-- Add a 8.0.9 feed -->
|
||||
<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" />
|
||||
<!-- Add a 8.0.10 feed -->
|
||||
<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-ca415e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ca415e95/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<clear />
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.2.24420.1">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.2.24464.3">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>e2b7b9d2b412cb2254d504789e29df8687d0f68e</Sha>
|
||||
<Sha>1a658dfc714a5064eea57af48d5fd68a3ffab7ef</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.1.24414.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>0fbd81404d1f211572387498474063bc6f407f0f</Sha>
|
||||
<Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
|
||||
</Dependency>
|
||||
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24414.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>0fbd81404d1f211572387498474063bc6f407f0f</Sha>
|
||||
<Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</Sha>
|
||||
</Dependency>
|
||||
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.1.24412.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24463.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>abbd67b97144c14ef60cdeb416ad9c5d75356c7f</Sha>
|
||||
<Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.1.24402.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.2.24455.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>edf3e90fa25b1fc4f7f63ceb45ef70f49c6b121a</Sha>
|
||||
<Sha>6e079c23aee94577c17bae34522b52df0d646ca5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24379.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24419.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/cecil</Uri>
|
||||
<Sha>b9d928a9d65ed39b9257846e1b8e853cea609c00</Sha>
|
||||
<Sha>c667bfea9cdbc5b5493e49e7ddc8dd635a217891</Sha>
|
||||
</Dependency>
|
||||
<!-- This is a subscription of the .NET 8/Xcode 15.4 versions of our packages -->
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_17.5" Version="17.5.8030">
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<!-- Versions updated by maestro -->
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-rc.2.24420.1</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24414.5</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-rc.2.24464.3</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24414.5</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
|
||||
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
|
||||
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24379.1</MicrosoftDotNetCecilPackageVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24419.1</MicrosoftDotNetCecilPackageVersion>
|
||||
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24459.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
|
||||
<!-- Manually updated versions -->
|
||||
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "9.0.100-rc.2.24420.1"
|
||||
"version": "9.0.100-rc.2.24464.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -160,7 +160,13 @@ namespace Xamarin.Tests {
|
|||
Assert.That (asm, Does.Exist, "Assembly existence");
|
||||
// Verify that there's no resources in the assembly
|
||||
var ad = AssemblyDefinition.ReadAssembly (asm, new ReaderParameters { ReadingMode = ReadingMode.Deferred });
|
||||
Assert.That (ad.MainModule.Resources.Count (), Is.EqualTo (2), "2 resources"); // There are 2 embedded resources by default by the F# compiler.
|
||||
var expectedFSharpResources = new string [] {
|
||||
"FSharpOptimizationCompressedData.fsharplibrary",
|
||||
"FSharpSignatureCompressedData.fsharplibrary",
|
||||
"FSharpSignatureCompressedDataB.fsharplibrary",
|
||||
};
|
||||
var actualFSharpResources = ad.MainModule.Resources.Select (v => v.Name).OrderBy (v => v).ToArray ();
|
||||
Assert.That (actualFSharpResources, Is.EqualTo (expectedFSharpResources), "F# resources:"); // There are some embedded resources by default by the F# compiler.
|
||||
}
|
||||
|
||||
[TestCase (ApplePlatform.iOS)]
|
||||
|
|
|
|||
|
|
@ -78,5 +78,8 @@ namespace Xamarin.Linker {
|
|||
public void Write (MethodDebugInformation info) => _symbolWriter.Write (info);
|
||||
public void Write () => _symbolWriter.Write ();
|
||||
public void Dispose () => _symbolWriter.Dispose ();
|
||||
#if NET
|
||||
public void Write (ICustomDebugInformationProvider provider) => _symbolWriter.Write (provider);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче