Merge branch 'main' into patch-2

2023-04-07 11:07:22 +03:00 · 2023-04-07 11:07:22 +03:00 · b49087fdfc
commit b49087fdfc
parent 4bcd02e499 fbcdd41913
10 changed files with 85 additions and 39 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -52,34 +52,34 @@
      <Uri>https://github.com/dotnet/runtime</Uri>
      <Sha>958b1e046cbfff5c0bc647f531b4fcf9eb197a6c</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
      <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
+      <Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
      <Uri>https://github.com/dotnet/test-templates</Uri>
@ -102,22 +102,22 @@
      <Uri>https://github.com/dotnet/test-templates</Uri>
      <Sha>5a41781eb69eb4721e736a99262dbd32b6bb55d4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23205.14">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23206.6">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
+      <Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23205.14">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23206.6">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
+      <Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23205.14">
+    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23206.6">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
+      <Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
      <SourceBuild RepoName="sdk" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23205.14">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23206.6">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
+      <Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.4.23177.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -181,9 +181,9 @@
      <Sha>b60c95e1ce736630d17e16626c59e3dd85ebae2b</Sha>
      <SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23178.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23203.1">
      <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379</Sha>
+      <Sha>33edde07d61cf7606d76ada765335fb81f1cbb71</Sha>
      <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-22503-02">
@ -218,9 +218,9 @@
      <Uri>https://github.com/dotnet/runtime</Uri>
      <Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23205.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23206.4">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>09c4d8e93c5b78897bccb4f27e0c373647fb3985</Sha>
+      <Sha>78ac065ec8e1c310df94c21518371b09aec00073</Sha>
      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23175-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -65,22 +65,22 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23205.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23205.3</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23205.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23205.3</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
-    <dotnetdevcertsPackageVersion>8.0.0-preview.4.23205.3</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>8.0.0-preview.4.23205.3</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>8.0.0-preview.4.23205.3</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23205.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23205.4</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23205.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23205.4</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
+    <dotnetdevcertsPackageVersion>8.0.0-preview.4.23205.4</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>8.0.0-preview.4.23205.4</dotnetuserjwtsPackageVersion>
+    <dotnetusersecretsPackageVersion>8.0.0-preview.4.23205.4</dotnetusersecretsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23205.14</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23205.14</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23205.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23206.6</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23206.6</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23206.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@ -18,8 +18,8 @@
      These URLs can't be composed from their base URL and version as we read them from the
      prep.sh and pipeline scripts, outside of MSBuild.
    -->
-    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
+    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
    <PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-17.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
-    <PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
+    <PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23178.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
  </PropertyGroup>
 </Project>
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@ -1,6 +1,6 @@
 {
  "tools": {
-    "dotnet": "8.0.100-preview.2.23157.25"
+    "dotnet": "8.0.100-preview.3.23178.7"
  },
  "msbuild-sdks": {
    "Microsoft.Build.CentralPackageVersions": "2.0.1",
--- a/src/SourceBuild/content/repo-projects/source-build-externals.proj
+++ b/src/SourceBuild/content/repo-projects/source-build-externals.proj
@ -3,6 +3,7 @@

  <PropertyGroup>
    <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
  </PropertyGroup>

  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
--- a/src/SourceBuild/content/repo-projects/symreader.proj
+++ b/src/SourceBuild/content/repo-projects/symreader.proj
@ -3,6 +3,7 @@

  <PropertyGroup>
    <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
  </PropertyGroup>

  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
--- a/src/SourceBuild/content/repo-projects/xdt.proj
+++ b/src/SourceBuild/content/repo-projects/xdt.proj
@ -7,6 +7,7 @@
    <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>

    <LogVerbosityOptOut>true</LogVerbosityOptOut>
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
  </PropertyGroup>

  <ItemGroup>
--- a/src/SourceBuild/content/repo-projects/xliff-tasks.proj
+++ b/src/SourceBuild/content/repo-projects/xliff-tasks.proj
@ -7,6 +7,7 @@

    <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
    <IsToolingProject>true</IsToolingProject>
+    <PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
  </PropertyGroup>

  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
--- a/src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch
+++ b/src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch
@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Thu, 6 Apr 2023 19:53:04 +0000
+Subject: [PATCH] Only pack the shipping/non-shipping nupkgs for roslyn
+
+Avoid packing release, pre-release stable nupkgs, and symbol nupkg.
+
+Backport: https://github.com/dotnet/roslyn/pull/67679
+---
+ eng/SourceBuild.props | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index d5d41e7167e..a8b55f352ad 100644
+--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
+@@ -4,8 +4,21 @@
+     <GitHubRepositoryName>roslyn</GitHubRepositoryName>
+     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
+     <SourceBuildTrimNetFrameworkTargets>true</SourceBuildTrimNetFrameworkTargets>
+    <!-- Roslyn produces stable release branded and stable pre-release branded artifacts in addition to the normal non-stable artifacts.
+         Only the non-stable artifacts should flow downstream in source build -->
+    <EnableDefaultSourceBuildIntermediateItems>false</EnableDefaultSourceBuildIntermediateItems>
+   </PropertyGroup>
+ 
+  <Target Name="GetCustomIntermediateNupkgContents" BeforeTargets="GetCategorizedIntermediateNupkgContents">
+    <ItemGroup>
+      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\**\*.nupkg" />
+      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\**\*.nupkg" />
+      <!-- Don't pack any symbol packages: not needed for downstream source-build CI.
+          Roslyn's symbol packages come in .Symbols.<version>.nupkg instead of the standard format. -->
+      <IntermediateNupkgArtifactFile Remove="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.Symbols.*.nupkg" />
+    </ItemGroup>
+  </Target>
+
+   <!--
+     The build script passes in the full path of the sln to build.  This must be overridden in order to build
+     the cloned source in the inner build.
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@ -405,6 +405,10 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
                     TargetFramework="net8.0"
                     ILLinkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
+    
+    <KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
+                             TargetFramework="net8.0"
+                             WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />

    <KnownRuntimePack Include="Microsoft.NETCore.App"
                      TargetFramework="net8.0"