Merge pull request #28584 from dotnet/darc-main-ea02237a-f937-463c-a5…

…a2-ef46b098f7a2 [main] Update dependencies from dotnet/runtime
dotnet · Oct 20, 2022 · fe5db31 · fe5db31
2 parents 8ea3a71 + c8b948c
commit fe5db31
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 42 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -6,41 +6,41 @@
       <Sha>dc2ac3aa1dfd6e9e8e6d96720ef32790469fd6c8</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-22519-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -114,30 +114,30 @@
       <Sha>add4655706f2d15de40da6a97c9c22d74e34b0e2</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.22520.1">
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>add4655706f2d15de40da6a97c9c22d74e34b0e2</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.22516.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -284,9 +284,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</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.22512.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -35,26 +35,26 @@
     <SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
     <MicrosoftDotNetSignToolVersion>8.0.0-beta.22513.2</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>
@@ -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 -->

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -1158,6 +1158,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ProjectCapability Remove="ReferenceManagerAssemblies" />
   </ItemGroup>
 
+  <!-- Temporary workaround for https://github.com/dotnet/runtime/issues/75468. Delete once the issue is fixed. -->
+  <PropertyGroup>
+    <LinkStandardCPlusPlusLibrary Condition="'$(OS)' != 'Windows_NT' and '$(LinkStandardCPlusPlusLibrary)' == ''">true</LinkStandardCPlusPlusLibrary>
+  </PropertyGroup>
+
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DisableStandardFrameworkResolution.targets" Condition="'$(DisableStandardFrameworkResolution)' == 'true'" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.DesignerSupport.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.GenerateAssemblyInfo.targets" Condition="'$(UsingNETSdkDefaults)' == 'true'"/>