[net8.0] Update dependencies from dotnet/installer (#18548)
This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## 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) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.ILLink.Tasks**: from 8.0.0-preview.7.23359.1 to 8.0.0-rc.1.23374.9 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.AspNetCore.App.Ref**: from 8.0.0-preview.7.23359.2 to 8.0.0-rc.1.23374.14 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NETCore.App.Ref**: from 8.0.0-preview.7.23359.1 to 8.0.0-rc.1.23374.9 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport**: from 8.0.0-preview.7.23326.1 to 8.0.0-rc.1.23368.3 (parent: Microsoft.NETCore.App.Ref) - **Microsoft.NETCore.App.Ref**: from 8.0.0-preview.7.23359.1 to 8.0.0-rc.1.23374.9 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.DotNet.Cecil**: from 0.11.4-alpha.23327.1 to 0.11.4-alpha.23360.2 (parent: Microsoft.NETCore.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:f9b68d84-9c90-4bd0-5499-08db4112d57e) ## From https://github.com/dotnet/installer - **Subscription**: f9b68d84-9c90-4bd0-5499-08db4112d57e - **Build**: 20230725.3 - **Date Produced**: July 25, 2023 10:39:06 AM UTC - **Commit**: e1872958afdb2b42b48f213efc8a6cd509816f0c - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 8.0.100-preview.7.23360.1 to 8.0.100-rc.1.23375.3][60] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.0-preview.7.23359.1 to 8.0.0-rc.1.23374.9][61] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0-preview.7.23359.2 to 8.0.0-rc.1.23374.14][62] - **Microsoft.NETCore.App.Ref**: [from 8.0.0-preview.7.23359.1 to 8.0.0-rc.1.23374.9][61] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport**: [from 8.0.0-preview.7.23326.1 to 8.0.0-rc.1.23368.3][63] - **Microsoft.NETCore.App.Ref**: [from 8.0.0-preview.7.23359.1 to 8.0.0-rc.1.23374.9][61] - **Microsoft.DotNet.Cecil**: [from 0.11.4-alpha.23327.1 to 0.11.4-alpha.23360.2][64] [60]:62ef57f114...e1872958af[61]:31106939ba...119667b5ef[62]:be566b1f4e...1bda10b33b[63]:60a73f97a0...1f68fcee45[64]:3e46711f5a...1a6a83a8f5[DependencyUpdate]: <> (End) [marker]: <> (End:f9b68d84-9c90-4bd0-5499-08db4112d57e) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <github-actions@xamarin.com> Co-authored-by: Alex Soto <alex@alexsoto.me> Co-authored-by: Alex Soto <alex@soto.dev> Co-authored-by: Filip Navara <navara@emclient.com>
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
44001edebb
Коммит
65ea7de123
|
|
@ -664,6 +664,11 @@ DOTNET_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET_VERSION)))
|
|||
DOTNET_VERSION_PRERELEASE_COMPONENT=$(subst $(DOTNET_VERSION_BAND),,$(DOTNET_VERSION))
|
||||
DOTNET_INSTALL_NAME=dotnet-sdk-$(DOTNET_VERSION)
|
||||
DOTNET_DIR=$(abspath $(TOP)/builds/downloads/$(DOTNET_INSTALL_NAME))
|
||||
# DOTNET_ROOT is no longer considered to find dotnet as seen here dotnet/roslyn@f454d69
|
||||
# but it seems that some tools like csc still needs it so let's export it.
|
||||
export DOTNET_ROOT=$(DOTNET_DIR)
|
||||
# dotnet now is being looked up in the PATH
|
||||
export PATH := $(DOTNET_DIR):$(PATH)
|
||||
DOTNET=$(DOTNET_DIR)/dotnet
|
||||
DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM))
|
||||
ifneq ($(DOTNET_BCL_DIR),$(shell ls -1d $(DOTNET_BCL_DIR) 2>/dev/null))
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23360.1">
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23375.3">
|
||||
<Uri>https://github.com/dotnet/installer</Uri>
|
||||
<Sha>62ef57f1140e7fa71cf452542b263e7999cac168</Sha>
|
||||
<Sha>e1872958afdb2b42b48f213efc8a6cd509816f0c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23359.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23374.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>31106939ba524a7e6df8225cf8d0fedefba92b9f</Sha>
|
||||
<Sha>119667b5ef2ce65ffa45c3a3d0b175a4e95c45e8</Sha>
|
||||
</Dependency>
|
||||
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23359.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23374.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>31106939ba524a7e6df8225cf8d0fedefba92b9f</Sha>
|
||||
<Sha>119667b5ef2ce65ffa45c3a3d0b175a4e95c45e8</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="8.0.0-preview.7.23359.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23374.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>be566b1f4ed1ab24765a3a4a2d1751dc73e7fcfc</Sha>
|
||||
<Sha>1bda10b33b6cc6f3bbaceabbadb4ddd18ca6e68e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23326.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23368.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>60a73f97a0ec16c25ce4d36b1bcff1fedb831716</Sha>
|
||||
<Sha>1f68fcee45ca75a2cb780edaff1e695af4d4f787</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23327.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23360.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/cecil</Uri>
|
||||
<Sha>3e46711f5a933551557286d211970faa08b07b7e</Sha>
|
||||
<Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
|
||||
</Dependency>
|
||||
<!-- This is a subscription of the .NET 7 versions of our packages -->
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7090">
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<!-- Versions updated by maestro -->
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23360.1</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23359.1</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23375.3</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23374.9</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23359.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23326.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23374.9</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23368.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
|
||||
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>7.0.7</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
|
||||
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23327.1</MicrosoftDotNetCecilPackageVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilPackageVersion>
|
||||
<!-- Manually updated versions -->
|
||||
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet7WorkloadVersion>
|
||||
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</EmscriptenWorkloadVersion>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "8.0.100-preview.7.23360.1"
|
||||
"version": "8.0.100-rc.1.23375.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,12 @@ namespace Xamarin.Tests {
|
|||
continue;
|
||||
|
||||
yield return record.Args;
|
||||
|
||||
if (record.Args is BuildFinishedEventArgs) {
|
||||
// Skip over anything that follows
|
||||
// https://github.com/xamarin/xamarin-macios/issues/18568
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -200,15 +206,7 @@ namespace Xamarin.Tests {
|
|||
|
||||
public static IEnumerable<BuildLogEvent> GetBuildMessages (string path)
|
||||
{
|
||||
var reader = new BinLogReader ();
|
||||
var eols = new char [] { '\n', '\r' };
|
||||
foreach (var record in reader.ReadRecords (path)) {
|
||||
if (record is null)
|
||||
continue;
|
||||
var args = record.Args;
|
||||
if (args is null)
|
||||
continue;
|
||||
|
||||
foreach (var args in ReadBuildEvents (path)) {
|
||||
if (args is BuildErrorEventArgs buildError) {
|
||||
var ea = buildError;
|
||||
yield return new BuildLogEvent {
|
||||
|
|
@ -259,11 +257,7 @@ namespace Xamarin.Tests {
|
|||
{
|
||||
value = null;
|
||||
|
||||
var reader = new BinLogReader ();
|
||||
foreach (var record in reader.ReadRecords (binlog)) {
|
||||
var args = record?.Args;
|
||||
if (args is null)
|
||||
continue;
|
||||
foreach (var args in ReadBuildEvents (binlog)) {
|
||||
if (args is PropertyInitialValueSetEventArgs pivsea) {
|
||||
if (string.Equals (property, pivsea.PropertyName, StringComparison.OrdinalIgnoreCase))
|
||||
value = pivsea.PropertyValue;
|
||||
|
|
|
|||
|
|
@ -27,12 +27,11 @@ namespace Xamarin.Tests {
|
|||
properties ["Configuration"] = configuration;
|
||||
|
||||
var result = DotNet.AssertBuild (project_path, properties);
|
||||
var reader = new BinLogReader ();
|
||||
var records = reader.ReadRecords (result.BinLogPath).ToList ();
|
||||
var recordArgs = BinLog.ReadBuildEvents (result.BinLogPath).ToList ();
|
||||
var findString = "Output Property: ArchiveDir";
|
||||
var archiveDirRecord = records.Where (v => v?.Args?.Message?.Contains (findString) == true).ToList ();
|
||||
var archiveDirRecord = recordArgs.Where (v => v?.Message?.Contains (findString) == true).ToList ();
|
||||
Assert.That (archiveDirRecord.Count, Is.GreaterThan (0), "ArchiveDir");
|
||||
var archiveDir = archiveDirRecord [0].Args.Message.Substring (findString.Length + 1).Trim ();
|
||||
var archiveDir = archiveDirRecord [0].Message.Substring (findString.Length + 1).Trim ();
|
||||
Assert.That (archiveDir, Does.Exist, "Archive directory existence");
|
||||
AssertDSymDirectory (appPath);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,13 +63,12 @@ namespace Xamarin.MacDev.Tasks {
|
|||
Assert.AreEqual (0, rv.ExitCode, "Exit code");
|
||||
|
||||
// Find the BundleIdentifier parameter to the DetectSigningIdentity task.
|
||||
var reader = new BinLogReader ();
|
||||
var records = reader.ReadRecords (rv.BinLogPath).ToList ();
|
||||
var taskIndex = records.FindIndex (v => v?.Args is TaskStartedEventArgs tsea && tsea.TaskName == "DetectSigningIdentity");
|
||||
var recordArgs = BinLog.ReadBuildEvents (rv.BinLogPath).ToList ();
|
||||
var taskIndex = recordArgs.FindIndex (v => v is TaskStartedEventArgs tsea && tsea.TaskName == "DetectSigningIdentity");
|
||||
Assert.That (taskIndex, Is.GreaterThan (0), "Task index");
|
||||
var taskParameterIndex = records.FindIndex (taskIndex + 1, v => v?.Args is BuildMessageEventArgs bmea && bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="));
|
||||
var taskParameterIndex = recordArgs.FindIndex (taskIndex + 1, v => v is BuildMessageEventArgs bmea && bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="));
|
||||
Assert.That (taskParameterIndex, Is.GreaterThan (0), "Parameter index");
|
||||
var taskParameter = (BuildMessageEventArgs) records [taskParameterIndex]?.Args;
|
||||
var taskParameter = (BuildMessageEventArgs) recordArgs [taskParameterIndex];
|
||||
var bundleIdentifier = taskParameter.Message.Substring ("Task Parameter:BundleIdentifier=".Length);
|
||||
Assert.AreEqual ("com.xamarin.detectsigningidentitytest", bundleIdentifier, "Bundle identifier");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,14 +144,7 @@ namespace Xamarin.Tests {
|
|||
WarningsEvents.Clear ();
|
||||
MessageEvents.Clear ();
|
||||
|
||||
var reader = new BinLogReader ();
|
||||
foreach (var record in reader.ReadRecords (log)) {
|
||||
if (record is null)
|
||||
continue;
|
||||
var args = record.Args;
|
||||
if (args is null)
|
||||
continue;
|
||||
|
||||
foreach (var args in BinLog.ReadBuildEvents (log)) {
|
||||
bool verbose = false;
|
||||
if (args is TaskStartedEventArgs tsea) {
|
||||
if (verbose)
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@ steps:
|
|||
displayName: 'Create runsettings for .NET tests'
|
||||
|
||||
- pwsh: |
|
||||
$Env:PATH = "$(Build.SourcesDirectory)\xamarin-macios\tests\dotnet\Windows\bin\dotnet;$env:PATH"
|
||||
$Env:DOTNET = "$(Build.SourcesDirectory)\xamarin-macios\tests\dotnet\Windows\bin\dotnet\dotnet.exe"
|
||||
& $(Build.SourcesDirectory)\xamarin-macios\tests\dotnet\Windows\bin\dotnet\dotnet.exe `
|
||||
test `
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче