Merge branch 'main' into darc-main-35b1ce53-93f3-4548-9141-a67575ca61c3

2023-06-12 14:08:56 -05:00 · 2023-06-12 14:08:56 -05:00 · 12cb761ea9
commit 12cb761ea9
parent 283e907548 7ab4688af9
7 changed files with 226 additions and 45 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -227,9 +227,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.23309.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23312.2">
      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>b0f656e394f8e98f48f11612ac997750bb85ff6c</Sha>
+      <Sha>ceb1133c46abe15ee48ea799950e7a6a74417b74</Sha>
      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23252.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@ -14,6 +14,8 @@
    <BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>

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

  <ItemGroup>
--- a/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch
+++ b/src/SourceBuild/patches/sdk/0002-Add-dependencies-needed-for-source-build-PVP-flow.patch
@ -0,0 +1,143 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Thu, 8 Jun 2023 22:21:02 +0000
+Subject: [PATCH] Add dependencies needed for source-build PVP flow
+
+Backport: https://github.com/dotnet/sdk/pull/33039
+---
+ eng/Version.Details.xml | 68 +++++++++++++++++++++++++++++++++++++++++
+ eng/Versions.props      | 28 ++++++++---------
+ 2 files changed, 82 insertions(+), 14 deletions(-)
+
+diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
+index 2bf363fc70..a242f463ee 100644
+--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
+@@ -112,15 +112,83 @@
+       <Uri>https://github.com/dotnet/aspnetcore</Uri>
+       <Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
+     </Dependency>
+    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+     <Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.57">
+       <Uri>https://github.com/nuget/nuget.client</Uri>
+       <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+     </Dependency>
+    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Commands" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Common" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Configuration" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Credentials" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Frameworks" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.LibraryModel" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.ProjectModel" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Protocol" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Packaging" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Versioning" Version="6.7.0-preview.3.57">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
+    </Dependency>
+     <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23307.1">
+       <Uri>https://github.com/microsoft/vstest</Uri>
+       <Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
+       <SourceBuild RepoName="vstest" ManagedOnly="true" />
+     </Dependency>
+    <Dependency Name="Microsoft.TestPlatform.CLI" Version="17.7.0-preview.23307.1">
+      <Uri>https://github.com/microsoft/vstest</Uri>
+      <Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.TestPlatform.Build" Version="17.7.0-preview.23307.1">
+      <Uri>https://github.com/microsoft/vstest</Uri>
+      <Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
+    </Dependency>
+     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23307.4">
+       <Uri>https://github.com/dotnet/runtime</Uri>
+       <Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
+diff --git a/eng/Versions.props b/eng/Versions.props
+index dfa5c80636..ee10eec2d2 100644
+--- a/eng/Versions.props
+++ b/eng/Versions.props
+@@ -61,25 +61,25 @@
+   <PropertyGroup>
+     <!-- Dependencies from https://github.com/nuget/nuget.client -->
+     <NuGetBuildTasksPackageVersion>6.7.0-preview.3.57</NuGetBuildTasksPackageVersion>
+-    <NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
+    <NuGetBuildTasksConsolePackageVersion>6.7.0-preview.3.57</NuGetBuildTasksConsolePackageVersion>
+     <NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
+-    <NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
+-    <NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
+-    <NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
+-    <MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
+-    <NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
+-    <NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
+-    <NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>
+-    <NuGetPackagingPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetPackagingPackageVersion>
+-    <NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
+-    <NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
+-    <NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
+    <NuGetBuildTasksPackPackageVersion>6.7.0-preview.3.57</NuGetBuildTasksPackPackageVersion>
+    <NuGetCommandLineXPlatPackageVersion>6.7.0-preview.3.57</NuGetCommandLineXPlatPackageVersion>
+    <NuGetProjectModelPackageVersion>6.7.0-preview.3.57</NuGetProjectModelPackageVersion>
+    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.7.0-preview.3.57</MicrosoftBuildNuGetSdkResolverPackageVersion>
+    <NuGetCommonPackageVersion>6.7.0-preview.3.57</NuGetCommonPackageVersion>
+    <NuGetConfigurationPackageVersion>6.7.0-preview.3.57</NuGetConfigurationPackageVersion>
+    <NuGetFrameworksPackageVersion>6.7.0-preview.3.57</NuGetFrameworksPackageVersion>
+    <NuGetPackagingPackageVersion>6.7.0-preview.3.57</NuGetPackagingPackageVersion>
+    <NuGetVersioningPackageVersion>6.7.0-preview.3.57</NuGetVersioningPackageVersion>
+    <NuGetPackagingVersion>6.7.0-preview.3.57</NuGetPackagingVersion>
+    <NuGetProjectModelVersion>6.7.0-preview.3.57</NuGetProjectModelVersion>
+   </PropertyGroup>
+   <PropertyGroup>
+     <!-- Dependencies from https://github.com/Microsoft/vstest -->
+     <MicrosoftNETTestSdkPackageVersion>17.7.0-preview.23307.1</MicrosoftNETTestSdkPackageVersion>
+-    <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
+-    <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
+    <MicrosoftTestPlatformCLIPackageVersion>17.7.0-preview.23307.1</MicrosoftTestPlatformCLIPackageVersion>
+    <MicrosoftTestPlatformBuildPackageVersion>17.7.0-preview.23307.1</MicrosoftTestPlatformBuildPackageVersion>
+   </PropertyGroup>
+   <PropertyGroup>
+     <!-- Dependencies from https://github.com/dotnet/runtime -->
--- a/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch
+++ b/src/SourceBuild/patches/sdk/0003-Additional-dependencies-for-PVP-flow.patch
@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic <nikolam@microsoft.com>
+Date: Mon, 12 Jun 2023 16:08:48 +0000
+Subject: [PATCH 2/2] Additional dependencies for PVP flow
+
+Backport: https://github.com/dotnet/sdk/pull/33179
+---
+ eng/Version.Details.xml | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
+index a242f463ee..645c3720c9 100644
+--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
+@@ -381,6 +381,21 @@
+       <Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
+       <SourceBuild RepoName="symreader" ManagedOnly="true" />
+     </Dependency>
+    <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+    </Dependency>
+    <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
+    </Dependency>
+    <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+    </Dependency>
+   </ProductDependencies>
+   <ToolsetDependencies>
+     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23302.3">
--- a/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml
+++ b/src/snaps/dotnet-sdk-6.0/snap/snapcraft.yaml
@ -1,30 +1,28 @@
 name: dotnet-sdk
-version: 6.0.408
+version: 6.0.410
 summary: Cross-Platform .NET Core SDK
 description: |
  .NET Core SDK. https://dot.net/core.

+architectures:
+  - build-on: amd64
+    run-on: amd64
+
 grade: stable
 confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
+base: core20

 parts:
  dotnet-sdk:
      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/dd7d2255-c9c1-4c6f-b8ad-6e853d6bb574/c8e1b5f47bf17b317a84487491915178/dotnet-sdk-6.0.408-linux-x64.tar.gz
-      source-checksum: sha512/d5eed37ce6c07546aa217d6e786f3b67be2b6d97c23d5888d9ee5d5398e8a9bfc06202b14e3529245f7ec78f4036778caf69bdbe099de805fe1f566277e8440e
+      source: https://download.visualstudio.microsoft.com/download/pr/ac5809b0-7930-4ae9-9005-58f2fd7912f3/4cf0cb18d22a162b33149b1f28a8e045/dotnet-sdk-6.0.410-linux-x64.tar.gz
+      source-checksum: sha512/8c85f5b10eb786c8cf31bf268131a2345a295d88d318310dc8457d831f0a587ec1600e43beb7f55aec2248483b9a95e905a468b592f0c910443b4aaa9baeb2e3
      stage-packages:      
-      - libicu60
-      - libc6
+      - libicu66
      - libgcc1
      - libstdc++6
-      - libssl1.0.0
-      - libcurl3
+      - libssl1.1
+      - libcurl4
      - libgssapi-krb5-2
      - zlib1g
      - lldb
@ -37,5 +35,7 @@ parts:
      plugin: dump
      source: .

-
+apps:
+  dotnet:
+    command: dotnet

--- a/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml
+++ b/src/snaps/dotnet-sdk-7.0/snap/snapcraft.yaml
@ -1,30 +1,28 @@
 name: dotnet-sdk
-version: 7.0.203
+version: 7.0.304
 summary: Cross-Platform .NET Core SDK
 description: |
  .NET Core SDK. https://dot.net/core.

+architectures:
+  - build-on: amd64
+    run-on: amd64
+
 grade: stable
 confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
+base: core20

 parts:
  dotnet-sdk:
      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/ebfd0bf8-79bd-480a-9e81-0b217463738d/9adc6bf0614ce02670101e278a2d8555/dotnet-sdk-7.0.203-linux-x64.tar.gz
-      source-checksum: sha512/ed1ae7cd88591ec52e1515c4a25d9a832eca29e8a0889549fea35a320e6e356e3806a17289f71fc0b04c36b006ae74446c53771d976c170fcbe5977ac7db1cb6
+      source: https://download.visualstudio.microsoft.com/download/pr/9c86d7b4-acb2-4be4-8a89-d13bc3c3f28f/1d044c7c29df018e8f2837bb343e8a84/dotnet-sdk-7.0.304-linux-x64.tar.gz
+      source-checksum: sha512/f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727
      stage-packages:
-      - libicu60
-      - libc6
+      - libicu66
      - libgcc1
      - libstdc++6
-      - libssl1.0.0
-      - libcurl3
+      - libssl1.1
+      - libcurl4
      - libgssapi-krb5-2
      - zlib1g
      - lldb
@ -37,5 +35,8 @@ parts:
      plugin: dump
      source: .

+apps:
+  dotnet:
+    command: dotnet


--- a/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml
+++ b/src/snaps/dotnet-sdk-8.0/snap/snapcraft.yaml
@ -1,30 +1,28 @@
 name: dotnet-sdk
-version: 8.0.100-preview.3.23178.7
+version: 8.0.100-preview.5.23303.2
 summary: Cross-Platform .NET Core SDK
 description: |
  .NET Core SDK. https://dot.net/core.

+architectures:
+  - build-on: amd64
+    run-on: amd64
+
 grade: stable
 confinement: classic
-
-apps:
-  dotnet:
-    command: dotnet
-
-base: core18
+base: core20

 parts:
  dotnet-sdk:
      plugin: dump
-      source: https://download.visualstudio.microsoft.com/download/pr/103d5e2c-d5c4-4101-bb6e-b82bc73a7d93/284a5cdccbc995f39806a3ba2dc17b93/dotnet-sdk-8.0.100-preview.3.23178.7-linux-x64.tar.gz
-      source-checksum: sha512/3b5d72979831256b9340a01db23d3b2dca801672546eeed04385949ed5f4363d3c731f31477ec82c7200ce88502dc45e03986c8acc8f2fc611b0343af5f1c488
+      source: https://download.visualstudio.microsoft.com/download/pr/07b027f8-4ef8-48cb-becc-132652c625bb/441ef662adfe931013745df24d53b26d/dotnet-sdk-8.0.100-preview.5.23303.2-linux-x64.tar.gz
+      source-checksum: sha512/dfe2085a92854a5cee84cb7be9344368f5dcb6333c4ca215375a34b862f3a3ee66c953b9957f7b46f6cd710992ee038f6b4c2bd16464b4a216a1785868e86f7c
      stage-packages:
-      - libicu60
-      - libc6
+      - libicu66
      - libgcc1
      - libstdc++6
-      - libssl1.0.0
-      - libcurl3
+      - libssl1.1
+      - libcurl4
      - libgssapi-krb5-2
      - zlib1g
      - lldb
@ -37,5 +35,6 @@ parts:
      plugin: dump
      source: .

-
-
+apps:
+  dotnet:
+    command: dotnet