Merge branch 'main' into Convert-TargetId-to-string

microsoft · Oct 21, 2024 · a56f399 · a56f399
2 parents 84e9db6 + 074837e
commit a56f399
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 55 deletions.
diff --git a/MIEngine.UnixPortSupplier.nuspec b/MIEngine.UnixPortSupplier.nuspec
@@ -12,7 +12,7 @@
     <tags></tags>
   </metadata>
   <files>
-    <file src="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
-    <file src="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
+    <file src="Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
+    <file src="Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
   </files>
 </package>
diff --git a/MIEngine.mdd.nuspec b/MIEngine.mdd.nuspec
@@ -12,10 +12,10 @@
     <tags></tags>
   </metadata>
   <files>
-    <file src="drop\Release\ReferenceAssemblies\*.xml" target="ref\dotnet" exclude="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" />
-    <file src="drop\Release\ReferenceAssemblies\Microsoft.DebugEngineHost.dll" target="ref\dotnet" />
-    <file src="drop\Release\Microsoft.MICore.dll" target="ref\dotnet" />
-    <file src="drop\Release\*" target="Release" exclude="drop\Release\Install.cmd;drop\Release\ReferenceAssemblies" />
-    <file src="drop\Release\loc\**\*" target="Release\loc" />
+    <file src="ReferenceAssemblies\*.xml" target="ref\dotnet" exclude="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" />
+    <file src="ReferenceAssemblies\Microsoft.DebugEngineHost.dll" target="ref\dotnet" />
+    <file src="Microsoft.MICore.dll" target="ref\dotnet" />
+    <file src="*" target="Release" exclude="Install.cmd;drop\Release\ReferenceAssemblies" />
+    <file src="loc\**\*" target="Release\loc" />
   </files>
 </package>
diff --git a/build/package_versions.settings.targets b/build/package_versions.settings.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
-        <Microsoft_VisualStudio_Interop_Version>17.8.37221</Microsoft_VisualStudio_Interop_Version>
+        <Microsoft_VisualStudio_Interop_Version>17.11.40262</Microsoft_VisualStudio_Interop_Version>
         <Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
         <Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
 
@@ -25,15 +25,19 @@
         <Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
         <Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
         <Microsoft_VisualStudio_Debugger_InteropA_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_InteropA_Version>
-        <Microsoft_VisualStudio_Shell_15_0_Version>17.8.37221</Microsoft_VisualStudio_Shell_15_0_Version>
-        <Microsoft_VisualStudio_Shell_Framework_Version>17.8.37221</Microsoft_VisualStudio_Shell_Framework_Version>
-        <Microsoft_VisualStudio_Threading_Version>17.8.14</Microsoft_VisualStudio_Threading_Version>
-        <Microsoft_VisualStudio_Utilities_Version>17.8.37221</Microsoft_VisualStudio_Utilities_Version>
+        <Microsoft_VisualStudio_Shell_15_0_Version>17.11.40262</Microsoft_VisualStudio_Shell_15_0_Version>
+        <Microsoft_VisualStudio_Shell_Framework_Version>17.11.40262</Microsoft_VisualStudio_Shell_Framework_Version>
+        <Microsoft_VisualStudio_Threading_Version>17.11.20</Microsoft_VisualStudio_Threading_Version>
+        <Microsoft_VisualStudio_Utilities_Version>17.11.40262</Microsoft_VisualStudio_Utilities_Version>
         <Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
         <Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
         <Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
-        <Microsoft_VisualStudio_TextManager_Interop_Version>17.8.37221</Microsoft_VisualStudio_TextManager_Interop_Version>
+        <Microsoft_VisualStudio_TextManager_Interop_Version>17.11.40262</Microsoft_VisualStudio_TextManager_Interop_Version>
         <Microsoft_VSSDK_BuildTools_Version>17.3.2093</Microsoft_VSSDK_BuildTools_Version>
         <System_Runtime_Loader_Version>4.3.0</System_Runtime_Loader_Version>
+
+        <!-- For Component Governance -->
+        <Microsoft_IO_Redist_Version>6.0.1</Microsoft_IO_Redist_Version>
+        <System_Text_Json_Version>8.0.4</System_Text_Json_Version>
     </PropertyGroup>
 </Project>
diff --git a/build/version.settings.targets b/build/version.settings.targets
@@ -3,7 +3,7 @@
     <!--SxS: These three properties should be changed at the start of a new version, VersionZeroYear should be the year
     before the start of the project.-->
     <MajorVersion>17</MajorVersion>
-    <MinorVersion>8</MinorVersion>
+    <MinorVersion>12</MinorVersion>
     <VersionZeroYear>2022</VersionZeroYear>
     <!-- Note: for compatibility, we leave the default assembly version of the repo at 14.0.
     If we ever decide to change this, make sure that you notify partner teams such as C++ IOT -->

diff --git a/eng/Scripts/CI-Build.ps1 b/eng/Scripts/CI-Build.ps1
@@ -3,7 +3,7 @@ param(
 [Alias("c")]
 [string]$Configuration="Debug",
 
-[ValidateSet("win-x86", "win10-arm64")]
+[ValidateSet("win-x86", "win-arm64")]
 [Alias("r")]
 [string]$RID="win-x86",
 

diff --git a/eng/pipelines/VS-release.yml b/eng/pipelines/VS-release.yml
@@ -1,7 +1,9 @@
 ---
 name: $(Date:yyyMMdd).$(Rev:r)
+
 variables:
-  - group: TSDTUSR
+- name: TeamName
+  value: MDDDebugger
 
 resources:
   repositories:
@@ -21,7 +23,7 @@ extends:
         name: VSEngSS-MicroBuild2022-1ES
         os: windows 
     stages:
-    - stage: stage
+    - stage: BuildVSReleasePackage
       displayName: VS_Release
       jobs:
       - job: Phase_1
@@ -38,4 +40,34 @@ extends:
               enabled: true
         steps:
         - template: /eng/pipelines/templates/VS-release.template.yml@self
+
+    - stage: VS_Insertion
+      dependsOn: [BuildVSReleasePackage]
+      jobs:
+      - job:
+        displayName: Insert package into VS
+        templateContext:
+          inputs:
+          - input: pipelineArtifact
+            artifactName: PackageVersion
+            targetPath: $(Build.ArtifactStagingDirectory)\PackageVersion
+        steps:
+        - checkout: none
+
+        - powershell: |
+            $version= [IO.File]::ReadAllText("$(Build.ArtifactStagingDirectory)\PackageVersion\NugetPackageVersion.txt")
+            Write-Host "##vso[task.setvariable variable=MDDPackageVersion;]$version"
+          displayName: 'Set MDDPackage Version'
+
+        - task: ms-vseng.MicroBuildShipTasks.55100717-a81d-45ea-a363-b8fe3ec375ad.MicroBuildInsertVsPayload@4
+          displayName: 'Insert VS Payload'
+          inputs:
+            TargetBranch: $(TargetBranch)  
+            TeamName: 'VS Debugger Platform'
+            TeamEmail: $(TEAMEMAIL)
+            DefaultConfigValues: 'VS.Redist.Debugger.MDD.MIEngine=$(MDDPackageVersion)'
+            RevisionTextFiles: 'src/SetupPackages/VC/IDE/MDD/core/revision.txt,src/SetupPackages/VC/IDE/MDD/res/revision.txt'
+            InsertionPayloadName: 'MIEngine $(MDDPackageVersion)'
+            InsertionDescription: 'Updating MIEngine to $(MDDPackageVersion). See $(Release.Artifacts.MIEngine_MDD.BuildURI)'
+            InsertionReviewers: $(InsertionReviewers)
 ...
diff --git a/eng/pipelines/VSCode-release.yml b/eng/pipelines/VSCode-release.yml
@@ -1,7 +1,9 @@
 ---
 name: $(Date:yyyMMdd).$(Rev:r)
+
 variables:
-  - group: TSDTUSR
+- name: TeamName
+  value: MDDDebugger
 
 resources:
   repositories:

diff --git a/eng/pipelines/steps/CopyAndPublishSymbols.yml b/eng/pipelines/steps/CopyAndPublishSymbols.yml
@@ -2,38 +2,27 @@
 ---
 parameters:
   OneESPT: false
+  SourceFolder: '$(Build.StagingDirectory)\drop'
 
 steps:
 - template: ../tasks/CopyFiles.yml
   parameters:
     displayName: 'Collect build symbols'
-    SourceFolder: '$(Build.SourcesDirectory)'
-    Contents: '$(Build.SourcesDirectory)\bin\**\*.+(pdb|exe|dll)'
+    SourceFolder: ${{ parameters.SourceFolder }}
+    Contents: '${{ parameters.SourceFolder }}\**\*.+(pdb|exe|dll)'
     TargetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
     CleanTargetFolder: true
 
-- task: PowerShell@2
-  displayName: 'Set Variables for PublishSymbols'
+
+- task: ms-vseng.MicroBuildShipTasks.0ffdda1d-8c7b-40da-b8b1-061660eaeea3.MicroBuildArchiveSymbols@5
+  displayName: 'Archive MIEngine_MDD on Symweb'
   inputs:
-    targetType: 'inline'
-    script: |
-      Write-Host "##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName]microsoft"
-      Write-Host "##vso[task.setvariable variable=ArtifactServices.Symbol.PAT;issecret=true;]${env:ARTIFACTSERVICES_SYMBOL_PAT}"
-      Write-Host "##vso[task.setvariable variable=ArtifactServices.Symbol.UseAAD]false"
-  env:
-    ARTIFACTSERVICES_SYMBOL_PAT: $(all-org-SymbolsReadWrite)
-
-- template: ../tasks/PublishSymbols.yml
-  parameters:
-    IndexSources: false
-    SymbolsFolder: '$(Build.ArtifactStagingDirectory)/symbols'
-    SearchPattern: '**\*.pdb'
-    SymbolServerType: TeamServices
-
-- template: ../tasks/1ES/PublishPipelineArtifact.yml
-  parameters:
-    displayName: 'Publish Symbols'
-    targetPath: '$(Build.ArtifactStagingDirectory)/symbols' 
-    artifactName: 'Symbols'
-    OneESPT: ${{ parameters.OneESPT }}
+    SymbolsFeatureName: MIEngine
+    SymbolsProject: VS
+    SymbolsAgentPath: '$(Build.ArtifactStagingDirectory)\Symbols\'
+    ExcludeAgentFolders: '$(Build.ArtifactStagingDirectory)\Symbols\Debug;$(Build.ArtifactStagingDirectory)\Symbols\Lab.Debug'
+    ${{ if parameters.OneESPT }}:
+      ExpirationInDays: 3650 # Expire in 10 years for release builds
+    ${{ else }}:
+      ExpirationInDays: 1 # Expire in 1 day if used for testing
 ...
diff --git a/eng/pipelines/steps/PublishOpenDebugAD7.yml b/eng/pipelines/steps/PublishOpenDebugAD7.yml
@@ -8,6 +8,7 @@ steps:
     dotnet publish $(Build.SourcesDirectory)\src\OpenDebugAD7\OpenDebugAD7.csproj -c ${{ parameters.Configuration }} -r ${{ parameters.RuntimeID }} --self-contained -o $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin
     copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\OpenDebugAD7.dll "$(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
     copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\Microsoft.DebugEngineHost.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
+    copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\Newtonsoft.Json.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
     copy ${{ parameters.SignedBinariesFolder }}\Release\Microsoft.MIDebugEngine.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
     copy ${{ parameters.SignedBinariesFolder }}\Release\Microsoft.MICore.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
   displayName: "Publish OpenDebugAD7 ${{ parameters.RuntimeID }}"

diff --git a/...elines/steps/PackAndPublishVSPackages.yml → eng/pipelines/steps/PublishVSPackages.yml b/...elines/steps/PackAndPublishVSPackages.yml → eng/pipelines/steps/PublishVSPackages.yml
@@ -19,21 +19,20 @@ steps:
     artifactName: 'PackageVersion'
     OneESPT: true
 
-- template: ../tasks/NuGetCommand.yml
-  parameters:
-    displayName: 'NuGet pack'
-    command: pack
-    searchPatternPack: '$(Build.SourcesDirectory)\MIEngine.mdd.nuspec;$(Build.SourcesDirectory)\MIEngine.UnixPortSupplier.nuspec'
-    configurationToPack: Release
-    buildProperties: 'version=$(NugetPackageVersion)'
-    basePath: ${{ parameters.BasePath }}
+- task: CopyFiles@2
+  inputs:
+    SourceFolder: $(Build.BinariesDirectory) 
+    Contents: '**/*.nupkg'
+    TargetFolder: $(Build.SourcesDirectory)/NugetPackages
+    flattenFolders: true
+    OverWrite: true
 
 - task: 1ES.PublishNuget@1
   displayName: Publish Nuget package
   condition: and(succeeded(), eq(variables['SignType'], 'real'))
   inputs:
-    packagesToPush: '$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.MIEngine.*.nupkg;$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.UnixPortSupplier.*.nupkg'
-    packageParentPath: '$(Build.SourcesDirectory)'
+    packagesToPush: '$(Build.SourcesDirectory)/NugetPackages/*.nupkg'
+    packageParentPath: '$(Build.SourcesDirectory)/NugetPackages'
     publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010' # VS
     nuGetFeedType: internal
 ...
diff --git a/eng/pipelines/templates/VS-release.template.yml b/eng/pipelines/templates/VS-release.template.yml
@@ -6,9 +6,12 @@ steps:
 
 - template: ../tasks/NuGetToolInstaller.yml
 
+- template: ../tasks/MicroBuildSigningPlugin.yml
+
 - template: ../steps/BuildSolution.yml
   parameters:
     Configuration: 'Lab.Release'
+    BuildArguments: /p:NuGetPath=$(NuGetExeToolPath) /p:NuGetPrerelease=false
     OneESPT: true
 
 - template: ../steps/CollectAndPublishBinaries.yml
@@ -25,7 +28,7 @@ steps:
   parameters:
     OneESPT: true
 
-- template: ../steps/PackAndPublishVSPackages.yml
+- template: ../steps/PublishVSPackages.yml
   parameters:
     BasePath: $(Build.StagingDirectory)
 

diff --git a/eng/pipelines/templates/VSCode-release.template.yml b/eng/pipelines/templates/VSCode-release.template.yml
@@ -1,6 +1,6 @@
 ---
 parameters:
-  rids: ["win-x86", "win10-arm64", "osx-x64", "osx-arm64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ]
+  rids: ["win-x86", "win-arm64", "osx-x64", "osx-arm64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ]
 
 steps:
 - checkout: self
@@ -28,6 +28,7 @@ steps:
 
 - template: ../steps/CopyAndPublishSymbols.yml
   parameters:
+    SourceFolder: '$(Build.StagingDirectory)\bin'
     OneESPT: true
 
 - script: |

diff --git a/src/DebugEngineHost/DebugEngineHost.csproj b/src/DebugEngineHost/DebugEngineHost.csproj
@@ -88,6 +88,13 @@
       <IncludeAssets>compile</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Label="Assembly to Generate">

diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -53,6 +53,13 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(Microsoft_VSSDK_BuildTools_Version)" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
+
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -214,6 +221,11 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageNuspec Include="$(MIEngineRoot)\MIEngine.mdd.nuspec" />
+    <NugetPackages Include="VS.Redist.Debugger.MDD.MIEngine" />
+  </ItemGroup>
+
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets') AND '$(MSBuildRuntimeType)' != 'Core'" />
 

diff --git a/...ixPortSupplier/Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.csproj b/...ixPortSupplier/Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.csproj
@@ -35,6 +35,11 @@
   <ItemGroup>
     <DropSignedFile Include="$(OutDir)\$(AssemblyName).dll" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageNuspec Include="$(MIEngineRoot)\MIEngine.UnixPortSupplier.nuspec" />
+    <NugetPackages Include="VS.Redist.Debugger.MDD.UnixPortSupplier" />
+  </ItemGroup>
 
   <Import Project="..\..\build\miengine.targets" />
   <Import Project="..\..\build\DropFiles.targets" />

diff --git a/src/SSHDebugPS/SSHDebugPS.csproj b/src/SSHDebugPS/SSHDebugPS.csproj
@@ -28,6 +28,13 @@
     </PackageReference>
 
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
+
+    <PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
+      <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -97,4 +104,5 @@
   </ItemGroup>
   <Import Project="..\..\build\miengine.targets" />
   <Import Project="..\..\build\miengine.csharp.localization.targets" />
+  <Import Project="..\..\build\DropFiles.targets" />
 </Project>