Skip to content

Commit

Permalink
Sign VS Insertion Nuget Packages (#1466)
Browse files Browse the repository at this point in the history
This PR removes the external YAML steps to create nuget packages and
injects it into the solution build process if its on the CI.
  • Loading branch information
WardenGnaw authored Sep 6, 2024
1 parent 3cba36d commit 61b1593
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 47 deletions.
4 changes: 2 additions & 2 deletions MIEngine.UnixPortSupplier.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.xml" target="ref\dotnet" />
<file src="ReferenceAssemblies\Microsoft.VisualStudio.Debugger.Interop.UnixPortSupplier.DesignTime.dll" target="ref\dotnet" />
</files>
</package>
10 changes: 5 additions & 5 deletions MIEngine.mdd.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
39 changes: 0 additions & 39 deletions eng/pipelines/steps/PackAndPublishVSPackages.yml

This file was deleted.

18 changes: 18 additions & 0 deletions eng/pipelines/steps/PublishVSPackages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Pack and Publish NuGet Packages for VS
# Creates:
# - VS.Redist.Debugger.MDD.MIEngine
# - VS.Redist.Debugger.MDD.UnixPortSupplier
---
parameters:
BasePath: $(Build.StagingDirectory)

steps:
- 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)'
publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010' # VS
nuGetFeedType: internal
...
5 changes: 4 additions & 1 deletion eng/pipelines/templates/VS-release.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +28,7 @@ steps:
parameters:
OneESPT: true

- template: ../steps/PackAndPublishVSPackages.yml
- template: ../steps/PublishVSPackages.yml
parameters:
BasePath: $(Build.StagingDirectory)

Expand Down
5 changes: 5 additions & 0 deletions src/MIDebugPackage/MIDebugPackage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -221,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'" />

Expand Down
6 changes: 6 additions & 0 deletions src/SSHDebugPS/SSHDebugPS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@
</ProjectReference>
</ItemGroup>

<ItemGroup>
<PackageNuspec Include="$(MIEngineRoot)\MIEngine.UnixPortSupplier.nuspec" />
<NugetPackages Include="VS.Redist.Debugger.MDD.UnixPortSupplier" />
</ItemGroup>

<ItemGroup>
<Compile Update="StringResources.Designer.cs">
<DesignTime>True</DesignTime>
Expand All @@ -104,4 +109,5 @@
</ItemGroup>
<Import Project="..\..\build\miengine.targets" />
<Import Project="..\..\build\miengine.csharp.localization.targets" />
<Import Project="..\..\build\DropFiles.targets" />
</Project>

0 comments on commit 61b1593

Please sign in to comment.