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.

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

[main] Update dependencies from dotnet/runtime #28584

Merged
merged 14 commits into from
Oct 20, 2022
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
<Sha>a266f9eb9a79d29e1664a1e8b18cc8e3d1f486bc</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22511-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -114,30 +114,30 @@
<Sha>6000a84c7e0b3678af032c25b7319aefdd057f6c</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22507.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>6000a84c7e0b3678af032c25b7319aefdd057f6c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22512.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -284,9 +284,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>508fe921a748de6efc8b5d979e17beb88ccf5bcf</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22507.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22512.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22512.8</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22519.7</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22512.8</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22519.7</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22504.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22512.8</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22512.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22519.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22519.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22512.8</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22519.7</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down Expand Up @@ -90,10 +90,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22512.8</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22512.8</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22512.8</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22519.7</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22519.7</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22519.7</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
testProject.AdditionalProperties["StripSymbols"] = "true";
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}
var testAsset = _testAssetsManager.CreateTestProject(testProject);

Expand Down Expand Up @@ -132,6 +135,9 @@ public void NativeAot_app_runs_in_debug_with_no_config_when_PublishAot_is_enable
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
testProject.AdditionalProperties["StripSymbols"] = "true";
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}

var testAsset = _testAssetsManager.CreateTestProject(testProject)
Expand Down Expand Up @@ -188,6 +194,9 @@ public void NativeAot_app_runs_in_release_with_no_config_when_PublishAot_is_enab
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
testProject.AdditionalProperties["StripSymbols"] = "true";
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}

var testAsset = _testAssetsManager.CreateTestProject(testProject)
Expand Down Expand Up @@ -276,9 +285,12 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string

// Linux symbol files are embedded and require additional steps to be stripped to a separate file
// assumes /bin (or /usr/bin) are in the PATH
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
testProject.AdditionalProperties["StripSymbols"] = "true";
testProject.AdditionalProperties["StripSymbols"] = "true";
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}
var testAsset = _testAssetsManager.CreateTestProject(testProject);

Expand Down Expand Up @@ -326,9 +338,12 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_empty(string t

// Linux symbol files are embedded and require additional steps to be stripped to a separate file
// assumes /bin (or /usr/bin) are in the PATH
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
testProject.AdditionalProperties["StripSymbols"] = "true";
// Enable Linux after this issue is fixed
LakshanF marked this conversation as resolved.
Show resolved Hide resolved
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}
var testAsset = _testAssetsManager.CreateTestProject(testProject);

Expand All @@ -349,7 +364,7 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_empty(string t
.And.HaveStdOutContaining("Hello World");
}
}

[RequiresMSBuildVersionTheory("17.0.0.32901")]
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAot_hw_runs_with_cross_target_PublishAot_is_enabled(string targetFramework)
Expand Down Expand Up @@ -554,6 +569,13 @@ public void NativeAot_compiler_runs_when_PublishAot_is_enabled(string targetFram
testProject.AdditionalProperties["PublishAot"] = "true";
testProject.AdditionalProperties["SuppressTrimAnalysisWarnings"] = "false";
testProject.AdditionalProperties["RuntimeIdentifier"] = rid;
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}

var testAsset = _testAssetsManager.CreateTestProject(testProject);

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
Expand Down Expand Up @@ -597,6 +619,14 @@ public void Warnings_are_generated_even_with_analyzers_disabled(string targetFra
testProject.AdditionalProperties["EnableSingleFileAnalyzer"] = "false";
testProject.AdditionalProperties["SuppressTrimAnalysisWarnings"] = "false";
testProject.AdditionalProperties["RuntimeIdentifier"] = rid;

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}

var testAsset = _testAssetsManager.CreateTestProject(testProject);

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
Expand Down Expand Up @@ -634,6 +664,12 @@ public void NativeAotStaticLib_only_runs_when_switch_is_enabled(string targetFra
testProject.AdditionalProperties["RuntimeIdentifier"] = rid;
testProject.AdditionalProperties["NativeLib"] = "Static";
testProject.AdditionalProperties["SelfContained"] = "true";
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}
var testAsset = _testAssetsManager.CreateTestProject(testProject);

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
Expand Down Expand Up @@ -665,6 +701,13 @@ public void NativeAotSharedLib_only_runs_when_switch_is_enabled(string targetFra
testProject.AdditionalProperties["RuntimeIdentifier"] = rid;
testProject.AdditionalProperties["NativeLib"] = "Shared";
testProject.AdditionalProperties["SelfContained"] = "true";
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}

var testAsset = _testAssetsManager.CreateTestProject(testProject);

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
Expand All @@ -691,6 +734,14 @@ public void It_publishes_with_implicit_rid_with_NativeAotApp(string targetFramew
var projectName = "ImplicitRidNativeAotApp";
var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true);
testProject.AdditionalProperties["PublishAot"] = "true";

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
}

var testAsset = _testAssetsManager.CreateTestProject(testProject);

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
Expand Down