Merge pull request #1501 from microsoft/dev/andarno/libtemplateUpdate

AArnott · web-flow · commit 1e85465efb1c · 2025-10-21T14:24:55.000-06:00
Merge latest Library.Template
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -10,7 +10,7 @@
       "rollForward": false
     },
     "dotnet-coverage": {
-      "version": "18.0.4",
+      "version": "18.1.0",
       "commands": [
         "dotnet-coverage"
       ],
@@ -29,6 +29,13 @@
         "docfx"
       ],
       "rollForward": false
+    },
+    "nerdbank.dotnetrepotools": {
+      "version": "1.0.92",
+      "commands": [
+        "repo"
+      ],
+      "rollForward": false
     }
   }
-}
+}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -43,7 +43,7 @@
   </ItemGroup>
   <Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsTestProject)'!='true'" />
   <ItemGroup Label="Library.Template">
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.1.0" />
diff --git a/azure-pipelines/archive-sourcecode.yml b/azure-pipelines/archive-sourcecode.yml
@@ -35,6 +35,8 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
 
diff --git a/azure-pipelines/libtemplate-update.yml b/azure-pipelines/libtemplate-update.yml
@@ -30,6 +30,8 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool:
         name: AzurePipelines-EO
diff --git a/azure-pipelines/official.yml b/azure-pipelines/official.yml
@@ -45,6 +45,8 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
       codeSignValidation:
diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
@@ -20,13 +20,16 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
 
     stages:
     - stage: release
       jobs:
-      - job: release
+      - job: nuget
+        displayName: 📦 Push nuget.org packages
         pool:
           name: AzurePipelines-EO
           demands:
@@ -43,6 +46,28 @@ extends:
             publishFeedCredentials: Microsoft.Windows.CsWin32
         steps:
         - checkout: none
+        - download: CI
+          artifact: deployables-Windows
+          displayName: 🔻 Download deployables-Windows artifact
+          patterns: 'NuGet/*'
+      - job: github
+        displayName: 📢 GitHub release
+        dependsOn: nuget
+        pool:
+          name: AzurePipelines-EO
+          demands:
+          - ImageOverride -equals 1ESPT-Ubuntu22.04
+          os: Linux
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            pipeline: CI
+            artifactName: deployables-Windows
+            targetPath: $(Pipeline.Workspace)/CI/deployables-Windows
+        steps:
+        - checkout: none
         - powershell: |
             Write-Host "##vso[build.updatebuildnumber]$(resources.pipeline.CI.runName)"
             if ('$(resources.pipeline.CI.runName)'.Contains('-')) {
@@ -51,10 +76,6 @@ extends:
               Write-Host "##vso[task.setvariable variable=IsPrerelease]false"
             }
           displayName: ⚙ Set up pipeline
-        - download: CI
-          artifact: deployables-Windows
-          displayName: 🔻 Download deployables-Windows artifact
-          patterns: 'NuGet/*'
         - task: GitHubRelease@1
           displayName: 📢 GitHub release (create)
           inputs:
diff --git a/azure-pipelines/unofficial.yml b/azure-pipelines/unofficial.yml
@@ -55,6 +55,8 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
       credscan:
diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml
@@ -23,6 +23,8 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
 
diff --git a/azure-pipelines/vs-validation.yml b/azure-pipelines/vs-validation.yml
@@ -26,6 +26,8 @@ variables:
 extends:
   template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
   parameters:
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean
     sdl:
       sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
       credscan:
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.305",
+    "version": "9.0.306",
     "rollForward": "patch",
     "allowPrerelease": false
   },
diff --git a/tools/variables/InsertJsonValues.ps1 b/tools/variables/InsertJsonValues.ps1
@@ -8,11 +8,25 @@ $BasePath = "$PSScriptRoot\..\..\bin\Packages\$BuildConfiguration\Vsix"
 
 if (Test-Path $BasePath) {
     $vsmanFiles = @()
-    Get-ChildItem $BasePath *.vsman -Recurse -File |% {
+    Get-ChildItem $BasePath *.vsman -Recurse -File | % {
         $version = (Get-Content $_.FullName | ConvertFrom-Json).info.buildVersion
+        $fullPath = (Resolve-Path $_.FullName).Path
+        $basePath = (Resolve-Path $BasePath).Path
+        # Cannot use RelativePath or GetRelativePath due to Powershell Core v2.0 limitation
+        if ($fullPath.StartsWith($basePath, [StringComparison]::OrdinalIgnoreCase)) {
+            # Get the relative paths then make sure the directory separators match URL format.
+            $rfn = $fullPath.Substring($basePath.Length).TrimStart('\', '/').Replace('\', '/')
+        }
+        else {
+            $rfn = $fullPath  # fallback to full path if it doesn't start with base path
+        }
+
         $fn = $_.Name
-        $vsmanFiles += "$fn{$version}=https://vsdrop.corp.microsoft.com/file/v1/$vstsDropNames;$fn"
+
+        # The left side is filename followed by the version and the right side is the drop url and the relative filename
+        $thisVsManFile = "$fn{$version}=https://vsdrop.corp.microsoft.com/file/v1/$vstsDropNames;$rfn"
+        $vsmanFiles += $thisVsManFile
     }
 
-    [string]::join(',',$vsmanFiles)
+    [string]::join(',', $vsmanFiles)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "9.0.305",`
	`3`	`+ "version": "9.0.306",`
`4`	`4`	`"rollForward": "patch",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`},`