Merge branch 'release/9.0.1xx' into internal-merge-9.0.1xx-2025-06-10-1319

Author: vseanreesermsft

.github/workflows/remove-lockdown-label.yml

@@ -0,0 +1,74 @@
+name: Remove Lockdown Label from PRs
+
+on:
+  pull_request:
+    types: [closed]
+
+permissions:
+    actions: write
+    pull-requests: write
+
+jobs:
+    remove-labels:
+        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'Branding')
+        runs-on: ubuntu-latest
+        steps:
+        -   name: Checkout repository
+            uses: actions/checkout@v2
+
+        -   name: PR's only change is <VersionFeature> in eng/Versions.props
+            id: only_version_feature_changed
+            uses: actions/github-script@v4
+            with:
+                script: |
+                    const otherChangesMessage = "❌ Changes in eng/Versions.props other than <VersionFeature> found";
+                    const onlyVersionFeatureMessage = "✅ PR's only change is <VersionFeature> in eng/Versions.props";
+                    const prNumber = context.payload.pull_request.number;
+                    const { data: files } = await github.pulls.listFiles({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        pull_number: prNumber
+                    });
+                    // If files other than eng/Versions.props are changed, output message and exit
+                    if (files.some(file => file.filename !== "eng/Versions.props")) {
+                        console.log(otherChangesMessage);
+                        core.exportVariable("only_version_feature_changed", "false");
+                        return;
+                    }
+                    // Iterate through the patch of eng/Versions.props to check for changes other than <VersionFeature>
+                    const versionsPropsFile = files.find(file => file.filename === "eng/Versions.props");
+                    const patchLines = versionsPropsFile.patch.split("\n").filter(l => l.startsWith("+") || l.startsWith("-"));
+                    for (const line of patchLines) {
+                        if (!line.includes("<VersionFeature>")) {
+                            console.log(otherChangesMessage);
+                            core.exportVariable("only_version_feature_changed", "false");
+                            return;
+                        }
+                    }
+                    console.log(onlyVersionFeatureMessage);
+                    core.exportVariable("only_version_feature_changed", "true");
+
+        -   name: Remove Branch Lockdown label from other PRs targeting this branch
+            if: steps.only_version_feature_changed.outputs.only_version_feature_changed == 'true'
+            uses: actions/github-script@v4
+            with:
+                script: |
+                    const prs = await github.pulls.list({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        state: 'open',
+                        base: github.event.pull_request.base.ref,
+                        per_page: 300
+                    });
+                    const filtered_prs = prs.data
+                        .filter(pr => pr.number !== github.context.payload.pull_request.number)
+                        .filter(pr => pr.labels.map(label => label.name).includes('Branch Lockdown'));
+                    for (const pr of filtered_prs) {
+                        await github.issues.removeLabel({
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            issue_number: pr.number,
+                            name: 'Branch Lockdown'
+                        });
+                        console.log(`Removed Branch Lockdown label from PR #${pr.number}`);
+                    }

NuGet.config

@@ -41,6 +41,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-0c96b36" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0c96b36c/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-1a9d00e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1a9d00e8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-088027f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-088027fb/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-c7cc0b3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c7cc0b3d/nuget/v3/index.json" />

eng/Version.Details.xml

@@ -3,16 +3,16 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.108">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1a9d00e83cf92e2e508a27a899023b04866fc2a8</Sha>
+      <Sha>088027fb4d4b86829fcee3ccba911a932e42642c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.108-servicing.25304.14">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.108-servicing.25311.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1a9d00e83cf92e2e508a27a899023b04866fc2a8</Sha>
+      <Sha>088027fb4d4b86829fcee3ccba911a932e42642c</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.108-servicing.25304.14">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.108-servicing.25311.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1a9d00e83cf92e2e508a27a899023b04866fc2a8</Sha>
+      <Sha>088027fb4d4b86829fcee3ccba911a932e42642c</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.6">

eng/Versions.props

@@ -193,7 +193,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>9.0.108-servicing.25304.14</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>9.0.108-servicing.25311.4</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>