[Recursive sync] sdk / 7b90c7f → 422fdd2

Updated repositories: - sdk / 7b90c7f → 422fdd2 https://github.com/dotnet/sdk/compare/7b90c7fc92d91e0600d298f654e4b82081f69cdd..422fdd279279a91f001e74d5c700d712b137030b [[ commit created by automation ]]
HUGODAI · Jan 10, 2025 · 039527e · 039527e
1 parent 4e624eb
commit 039527e
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 108 deletions.
diff --git a/prereqs/git-info/sdk.props b/prereqs/git-info/sdk.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <GitCommitHash>7b90c7fc92d91e0600d298f654e4b82081f69cdd</GitCommitHash>
+    <GitCommitHash>422fdd279279a91f001e74d5c700d712b137030b</GitCommitHash>
     <OfficialBuildId>20250110.1</OfficialBuildId>
     <OutputPackageVersion>0.0.0</OutputPackageVersion>
   </PropertyGroup>

diff --git a/src/sdk/eng/pipelines/templates/stages/vmr-build.yml b/src/sdk/eng/pipelines/templates/stages/vmr-build.yml
@@ -106,29 +106,28 @@ stages:
     ### Additional jobs for lite/full builds ###
     - ${{ if in(parameters.scope, 'lite', 'full') }}:
 
-      # Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
-      # - template: ../jobs/vmr-build.yml
-      #   parameters:
-      #     # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
-      #     buildName: ${{ format('{0}_Online_CurrentSourceBuiltSdk', variables.centOSStreamName) }}
-      #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-      #     vmrBranch: ${{ variables.VmrBranch }}
-      #     targetArchitecture: x64
-      #     pool: ${{ parameters.pool_Linux }}
-      #     container:
-      #       name: ${{ variables.centOSStreamContainerName }}
-      #       image: ${{ variables.centOSStreamContainerImage }}
-      #     buildFromArchive: false            # 🚫
-      #     buildSourceOnly: true              # ✅
-      #     enablePoison: false                # 🚫
-      #     excludeOmniSharpTests: true        # ✅
-      #     runOnline: true                    # ✅
-      #     useMonoRuntime: false              # 🚫
-      #     withPreviousSDK: false             # 🚫
-      #     reuseBuildArtifactsFrom:
-      #     - ${{ format('{0}_Online_MsftSdk_x64', variables.centOSStreamName) }}
+      - template: ../jobs/vmr-build.yml
+        parameters:
+          # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
+          buildName: ${{ format('{0}_Online_CurrentSourceBuiltSdk', variables.centOSStreamName) }}
+          isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+          vmrBranch: ${{ variables.VmrBranch }}
+          targetArchitecture: x64
+          pool: ${{ parameters.pool_Linux }}
+          container:
+            name: ${{ variables.centOSStreamContainerName }}
+            image: ${{ variables.centOSStreamContainerImage }}
+          buildFromArchive: false            # 🚫
+          buildSourceOnly: true              # ✅
+          enablePoison: false                # 🚫
+          excludeOmniSharpTests: true        # ✅
+          runOnline: true                    # ✅
+          useMonoRuntime: false              # 🚫
+          withPreviousSDK: false             # 🚫
+          reuseBuildArtifactsFrom:
+          - ${{ format('{0}_Online_MsftSdk_x64', variables.centOSStreamName) }}
 
-      # Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
+      # Disabled due to https://github.com/dotnet/source-build/issues/4819
       # - template: ../jobs/vmr-build.yml
       #   parameters:
       #     # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
@@ -232,47 +231,45 @@ stages:
             useMonoRuntime: false              # 🚫
             withPreviousSDK: false             # 🚫
 
-        # Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
-        # - template: ../jobs/vmr-build.yml
-        #   parameters:
-        #     # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
-        #     buildName: ${{ format('{0}_Online_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
-        #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-        #     vmrBranch: ${{ variables.VmrBranch }}
-        #     targetArchitecture: x64
-        #     artifactsRid: ${{ variables.centOSStreamX64Rid }}
-        #     pool: ${{ parameters.pool_Linux }}
-        #     container:
-        #       name: ${{ variables.centOSStreamContainerName }}
-        #       image: ${{ variables.centOSStreamContainerImage }}
-        #     buildFromArchive: false            # 🚫
-        #     buildSourceOnly: true              # ✅
-        #     enablePoison: false                # 🚫
-        #     excludeOmniSharpTests: false       # 🚫
-        #     runOnline: true                    # ✅
-        #     useMonoRuntime: false              # 🚫
-        #     withPreviousSDK: true              # ✅
-
-        # Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
-        # - template: ../jobs/vmr-build.yml
-        #   parameters:
-        #     # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
-        #     buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
-        #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-        #     vmrBranch: ${{ variables.VmrBranch }}
-        #     targetArchitecture: x64
-        #     artifactsRid: ${{ variables.centOSStreamX64Rid }}
-        #     pool: ${{ parameters.pool_Linux }}
-        #     container:
-        #       name: ${{ variables.centOSStreamContainerName }}
-        #       image: ${{ variables.centOSStreamContainerImage }}
-        #     buildFromArchive: false            # 🚫
-        #     buildSourceOnly: true              # ✅
-        #     enablePoison: false                # 🚫
-        #     excludeOmniSharpTests: true        # ✅
-        #     runOnline: false                   # 🚫
-        #     useMonoRuntime: false              # 🚫
-        #     withPreviousSDK: true              # ✅
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
+            buildName: ${{ format('{0}_Online_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            targetArchitecture: x64
+            artifactsRid: ${{ variables.centOSStreamX64Rid }}
+            pool: ${{ parameters.pool_Linux }}
+            container:
+              name: ${{ variables.centOSStreamContainerName }}
+              image: ${{ variables.centOSStreamContainerImage }}
+            buildFromArchive: false            # 🚫
+            buildSourceOnly: true              # ✅
+            enablePoison: false                # 🚫
+            excludeOmniSharpTests: false       # 🚫
+            runOnline: true                    # ✅
+            useMonoRuntime: false              # 🚫
+            withPreviousSDK: true              # ✅
+
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
+            buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            targetArchitecture: x64
+            artifactsRid: ${{ variables.centOSStreamX64Rid }}
+            pool: ${{ parameters.pool_Linux }}
+            container:
+              name: ${{ variables.centOSStreamContainerName }}
+              image: ${{ variables.centOSStreamContainerImage }}
+            buildFromArchive: false            # 🚫
+            buildSourceOnly: true              # ✅
+            enablePoison: false                # 🚫
+            excludeOmniSharpTests: true        # ✅
+            runOnline: false                   # 🚫
+            useMonoRuntime: false              # 🚫
+            withPreviousSDK: true              # ✅
 
         - template: ../jobs/vmr-build.yml
           parameters:
@@ -331,49 +328,47 @@ stages:
             useMonoRuntime: false              # 🚫
             withPreviousSDK: false             # 🚫
 
-        # Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
-        # - template: ../jobs/vmr-build.yml
-        #   parameters:
-        #     # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
-        #     buildName: ${{ format('{0}_Offline_CurrentSourceBuiltSdk', variables.fedoraName) }}
-        #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-        #     vmrBranch: ${{ variables.VmrBranch }}
-        #     targetArchitecture: x64
-        #     pool: ${{ parameters.pool_Linux }}
-        #     container:
-        #       name: ${{ variables.fedoraContainerName }}
-        #       image: ${{ variables.fedoraContainerImage }}
-        #     buildFromArchive: false            # 🚫
-        #     buildSourceOnly: true              # ✅
-        #     enablePoison: false                # 🚫
-        #     excludeOmniSharpTests: false       # 🚫
-        #     runOnline: false                   # 🚫
-        #     useMonoRuntime: false              # 🚫
-        #     withPreviousSDK: false             # 🚫
-        #     reuseBuildArtifactsFrom:
-        #     - ${{ format('{0}_Offline_MsftSdk_x64', variables.fedoraName) }}
-
-        # Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
-        # - template: ../jobs/vmr-build.yml
-        #   parameters:
-        #     # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
-        #     buildName: ${{ format('{0}_Mono_Offline_CurrentSourceBuiltSdk', variables.centOSStreamName) }}
-        #     isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-        #     vmrBranch: ${{ variables.VmrBranch }}
-        #     targetArchitecture: x64
-        #     pool: ${{ parameters.pool_Linux }}
-        #     container:
-        #       name: ${{ variables.centOSStreamContainerName }}
-        #       image: ${{ variables.centOSStreamContainerImage }}
-        #     buildFromArchive: true             # ✅
-        #     buildSourceOnly: true              # ✅
-        #     enablePoison: false                # 🚫
-        #     excludeOmniSharpTests: true        # ✅
-        #     runOnline: false                   # 🚫
-        #     useMonoRuntime: true               # ✅
-        #     withPreviousSDK: false             # 🚫
-        #     reuseBuildArtifactsFrom:
-        #     - ${{ format('{0}_Mono_Offline_MsftSdk_x64', variables.centOSStreamName) }}
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
+            buildName: ${{ format('{0}_Offline_CurrentSourceBuiltSdk', variables.fedoraName) }}
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            targetArchitecture: x64
+            pool: ${{ parameters.pool_Linux }}
+            container:
+              name: ${{ variables.fedoraContainerName }}
+              image: ${{ variables.fedoraContainerImage }}
+            buildFromArchive: false            # 🚫
+            buildSourceOnly: true              # ✅
+            enablePoison: false                # 🚫
+            excludeOmniSharpTests: false       # 🚫
+            runOnline: false                   # 🚫
+            useMonoRuntime: false              # 🚫
+            withPreviousSDK: false             # 🚫
+            reuseBuildArtifactsFrom:
+            - ${{ format('{0}_Offline_MsftSdk_x64', variables.fedoraName) }}
+
+        - template: ../jobs/vmr-build.yml
+          parameters:
+            # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
+            buildName: ${{ format('{0}_Mono_Offline_CurrentSourceBuiltSdk', variables.centOSStreamName) }}
+            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+            vmrBranch: ${{ variables.VmrBranch }}
+            targetArchitecture: x64
+            pool: ${{ parameters.pool_Linux }}
+            container:
+              name: ${{ variables.centOSStreamContainerName }}
+              image: ${{ variables.centOSStreamContainerImage }}
+            buildFromArchive: true             # ✅
+            buildSourceOnly: true              # ✅
+            enablePoison: false                # 🚫
+            excludeOmniSharpTests: true        # ✅
+            runOnline: false                   # 🚫
+            useMonoRuntime: true               # ✅
+            withPreviousSDK: false             # 🚫
+            reuseBuildArtifactsFrom:
+            - ${{ format('{0}_Mono_Offline_MsftSdk_x64', variables.centOSStreamName) }}
 
 #### VERTICAL BUILD (Validation) ####
 - ${{ if and(not(parameters.isSourceOnlyBuild), or(eq(variables['Build.Reason'], 'PullRequest'), ne(variables['System.TeamProject'], 'internal'))) }}:

diff --git a/src/source-manifest.json b/src/source-manifest.json
@@ -124,7 +124,7 @@
       "barId": null,
       "path": "sdk",
       "remoteUri": "https://github.com/dotnet/sdk",
-      "commitSha": "7b90c7fc92d91e0600d298f654e4b82081f69cdd"
+      "commitSha": "422fdd279279a91f001e74d5c700d712b137030b"
     },
     {
       "packageVersion": "10.0.605604",