Skip to content

Commit 61b1593

Browse files
authored
Sign VS Insertion Nuget Packages (#1466)
This PR removes the external YAML steps to create nuget packages and injects it into the solution build process if its on the CI.
1 parent 3cba36d commit 61b1593

7 files changed

+40
-47
lines changed

MIEngine.UnixPortSupplier.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<tags></tags>
1313
</metadata>
1414
<files>
15-
<file src="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
16-
<file src="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
15+
<file src="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
16+
<file src="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
1717
</files>
1818
</package>

MIEngine.mdd.nuspec

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<tags></tags>
1313
</metadata>
1414
<files>
15-
<file src="drop\Release\ReferenceAssemblies\*.xml" target="ref\dotnet" exclude="drop\Release\ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" />
16-
<file src="drop\Release\ReferenceAssemblies\Microsoft.DebugEngineHost.dll" target="ref\dotnet" />
17-
<file src="drop\Release\Microsoft.MICore.dll" target="ref\dotnet" />
18-
<file src="drop\Release\*" target="Release" exclude="drop\Release\Install.cmd;drop\Release\ReferenceAssemblies" />
19-
<file src="drop\Release\loc\**\*" target="Release\loc" />
15+
<file src="ReferenceAssemblies\*.xml" target="ref\dotnet" exclude="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" />
16+
<file src="ReferenceAssemblies\Microsoft.DebugEngineHost.dll" target="ref\dotnet" />
17+
<file src="Microsoft.MICore.dll" target="ref\dotnet" />
18+
<file src="*" target="Release" exclude="Install.cmd;drop\Release\ReferenceAssemblies" />
19+
<file src="loc\**\*" target="Release\loc" />
2020
</files>
2121
</package>

eng/pipelines/steps/PackAndPublishVSPackages.yml

-39
This file was deleted.
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Pack and Publish NuGet Packages for VS
2+
# Creates:
3+
# - VS.Redist.Debugger.MDD.MIEngine
4+
# - VS.Redist.Debugger.MDD.UnixPortSupplier
5+
---
6+
parameters:
7+
BasePath: $(Build.StagingDirectory)
8+
9+
steps:
10+
- task: 1ES.PublishNuget@1
11+
displayName: Publish Nuget package
12+
condition: and(succeeded(), eq(variables['SignType'], 'real'))
13+
inputs:
14+
packagesToPush: '$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.MIEngine.*.nupkg;$(Build.SourcesDirectory)\VS.Redist.Debugger.MDD.UnixPortSupplier.*.nupkg'
15+
packageParentPath: '$(Build.SourcesDirectory)'
16+
publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010' # VS
17+
nuGetFeedType: internal
18+
...

eng/pipelines/templates/VS-release.template.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ steps:
66

77
- template: ../tasks/NuGetToolInstaller.yml
88

9+
- template: ../tasks/MicroBuildSigningPlugin.yml
10+
911
- template: ../steps/BuildSolution.yml
1012
parameters:
1113
Configuration: 'Lab.Release'
14+
BuildArguments: /p:NuGetPath=$(NuGetExeToolPath) /p:NuGetPrerelease=false
1215
OneESPT: true
1316

1417
- template: ../steps/CollectAndPublishBinaries.yml
@@ -25,7 +28,7 @@ steps:
2528
parameters:
2629
OneESPT: true
2730

28-
- template: ../steps/PackAndPublishVSPackages.yml
31+
- template: ../steps/PublishVSPackages.yml
2932
parameters:
3033
BasePath: $(Build.StagingDirectory)
3134

src/MIDebugPackage/MIDebugPackage.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,11 @@
221221
</ProjectReference>
222222
</ItemGroup>
223223

224+
<ItemGroup>
225+
<PackageNuspec Include="$(MIEngineRoot)\MIEngine.mdd.nuspec" />
226+
<NugetPackages Include="VS.Redist.Debugger.MDD.MIEngine" />
227+
</ItemGroup>
228+
224229
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
225230
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets') AND '$(MSBuildRuntimeType)' != 'Core'" />
226231

src/SSHDebugPS/SSHDebugPS.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@
9090
</ProjectReference>
9191
</ItemGroup>
9292

93+
<ItemGroup>
94+
<PackageNuspec Include="$(MIEngineRoot)\MIEngine.UnixPortSupplier.nuspec" />
95+
<NugetPackages Include="VS.Redist.Debugger.MDD.UnixPortSupplier" />
96+
</ItemGroup>
97+
9398
<ItemGroup>
9499
<Compile Update="StringResources.Designer.cs">
95100
<DesignTime>True</DesignTime>
@@ -104,4 +109,5 @@
104109
</ItemGroup>
105110
<Import Project="..\..\build\miengine.targets" />
106111
<Import Project="..\..\build\miengine.csharp.localization.targets" />
112+
<Import Project="..\..\build\DropFiles.targets" />
107113
</Project>

0 commit comments

Comments
 (0)