Skip to content

Commit 762aaca

Browse files
tydunkelheaths
authored andcommitted
Replace nuproj with signproj
1 parent 753d0af commit 762aaca

File tree

7 files changed

+74
-93
lines changed

7 files changed

+74
-93
lines changed

Diff for: VSIXBootstrapper.sln

-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
EndProject
1717
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{8EB71D2B-70CF-418B-9EE8-9B3BE2EE2D9B}"
1818
EndProject
19-
Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "VSIXBootstrapper", "pkg\VSIXBootstrapper\VSIXBootstrapper.nuproj", "{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}"
20-
EndProject
2119
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSIXBootstrapper.Shared", "src\VSIXBootstrapper.Shared\VSIXBootstrapper.Shared.vcxitems", "{2A3EA4C8-207C-4AB4-A74F-4640A529767E}"
2220
EndProject
2321
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{79F3BEAF-FBD2-4E77-8A47-CA8D12A478F4}"
@@ -39,10 +37,6 @@ Global
3937
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Debug|x86.Build.0 = Debug|Win32
4038
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Release|x86.ActiveCfg = Release|Win32
4139
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Release|x86.Build.0 = Release|Win32
42-
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Debug|x86.ActiveCfg = Debug|Any CPU
43-
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Debug|x86.Build.0 = Debug|Any CPU
44-
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Release|x86.ActiveCfg = Release|Any CPU
45-
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Release|x86.Build.0 = Release|Any CPU
4640
{EEADDAC3-DDD5-4A28-BB13-B3B76682C1E1}.Debug|x86.ActiveCfg = Debug|Win32
4741
{EEADDAC3-DDD5-4A28-BB13-B3B76682C1E1}.Debug|x86.Build.0 = Debug|Win32
4842
{EEADDAC3-DDD5-4A28-BB13-B3B76682C1E1}.Release|x86.ActiveCfg = Release|Win32
@@ -53,7 +47,6 @@ Global
5347
EndGlobalSection
5448
GlobalSection(NestedProjects) = preSolution
5549
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067} = {3A5D9917-703F-4280-81ED-F2E2BA648CB8}
56-
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB} = {8EB71D2B-70CF-418B-9EE8-9B3BE2EE2D9B}
5750
{2A3EA4C8-207C-4AB4-A74F-4640A529767E} = {3A5D9917-703F-4280-81ED-F2E2BA648CB8}
5851
{EEADDAC3-DDD5-4A28-BB13-B3B76682C1E1} = {79F3BEAF-FBD2-4E77-8A47-CA8D12A478F4}
5952
EndGlobalSection

Diff for: build/templates/build.yml

+22
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,28 @@ steps:
3535
runInParallel: true
3636
codeCoverageEnabled: true
3737

38+
- task: NuGetCommand@2
39+
displayName: Package VsixBootstrapper.nupkg
40+
inputs:
41+
command: pack
42+
packagesToPack: pkg\VsixBootstrapper\VsixBootstrapper.nuspec
43+
configuration: ${{ parameters.BuildConfiguration }}
44+
packDestination: $(Build.SourcesDirectory)\bin\${{ parameters.BuildConfiguration }}
45+
buildProperties: solutionDir=$(Build.SourcesDirectory);version=$(NBGV_NuGetPackageVersion)
46+
47+
- task: NuGetCommand@2
48+
displayName: Restore VsixBootstrapper.signproj
49+
inputs:
50+
command: restore
51+
restoreSolution: $(Build.SourcesDirectory)\pkg\VsixBootstrapper\VsixBootstrapper.signproj
52+
53+
- task: VSBuild@1
54+
displayName: Sign nupkg
55+
inputs:
56+
configuration: ${{ parameters.BuildConfiguration }}
57+
platform: ${{ parameters.BuildPlatform }}
58+
solution: $(Build.SourcesDirectory)\pkg\VsixBootstrapper\VsixBootstrapper.signproj
59+
3860
- template: ${{ parameters.PublishArtifactTemplate }}
3961
parameters:
4062
path: bin\${{ parameters.BuildConfiguration }}

Diff for: pkg/VSIXBootstrapper/VSIXBootstrapper.nuproj

-80
This file was deleted.

Diff for: pkg/VSIXBootstrapper/VSIXBootstrapper.signproj

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" Sdk="Microsoft.Build.NoTargets/3.7.56">
3+
<PropertyGroup>
4+
<SolutionDir Condition="'$(SolutionDir)'==''">..\..\</SolutionDir>
5+
<SolutionDir Condition="!HasTrailingSlash('$(SolutionDir)')">$(SolutionDir)\</SolutionDir>
6+
<OutDir Condition="'$(OutDir)'==''">$(SolutionDir)bin\$(Configuration)\</OutDir>
7+
<OutDir Condition="!HasTrailingSlash('$(OutDir)')">$(OutDir)\</OutDir>
8+
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)'==''">$(SolutionDir)obj\$(Configuration)\</IntermediateOutputPath>
9+
<IntermediateOutputPath Condition="!HasTrailingSlash('$(IntermediateOutputPath)')">$(IntermediateOutputPath)\</IntermediateOutputPath>
10+
<TargetFramework>net48</TargetFramework>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" version="1.0.0" />
15+
</ItemGroup>
16+
17+
<Target Name="Sign" DependsOnTargets="$(SignDependsOn)" AfterTargets="AfterBuild">
18+
<PropertyGroup>
19+
<OutDir Condition="!HasTrailingSlash('$(OutDir)')">$(OutDir)\</OutDir>
20+
<IntermediateOutputPath Condition="!HasTrailingSlash('$(IntermediateOutputPath)')">$(IntermediateOutputPath)\</IntermediateOutputPath>
21+
</PropertyGroup>
22+
<ItemGroup>
23+
<FilesToSign Include="$(OutDir)**\*.nupkg">
24+
<Authenticode>NuGet</Authenticode>
25+
</FilesToSign>
26+
</ItemGroup>
27+
</Target>
28+
</Project>

Diff for: pkg/VSIXBootstrapper/VsixBootstrapper.nuspec

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>VSIXBootstrapper</id>
5+
<title>VSIX Installer Bootstrapper</title>
6+
<version>$version$</version>
7+
<summary>VSIX Installer Bootstrapper</summary>
8+
<description>An installer that can be chained with other packages to locate the latest VSIXInstaller.exe to use for installing VSIX extensions.</description>
9+
<releaseNotes></releaseNotes>
10+
<authors>Microsoft</authors>
11+
<owners>Microsoft</owners>
12+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
13+
<projectUrl>https://github.com/Microsoft/vsixbootstrapper</projectUrl>
14+
<licenseUrl>https://github.com/Microsoft/vsixbootstrapper/raw/develop/LICENSE.txt</licenseUrl>
15+
<iconUrl>https://go.microsoft.com/fwlink/?linkid=839265</iconUrl>
16+
</metadata>
17+
<files>
18+
<file src="$solutionDir$\bin\$configuration$\VSIXBootstrapper.exe" target="tools" />
19+
<file src="build\VSIXBootstrapper.props" target="build" />
20+
</files>
21+
</package>

Diff for: pkg/VSIXBootstrapper/packages.config

-5
This file was deleted.

Diff for: version.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
"includeCommitId": {
1313
"when": "nonPublicReleaseOnly"
1414
}
15-
}
15+
},
16+
"setVersionVariables": true,
17+
"setAllVariables": true
1618
}
1719
}

0 commit comments

Comments
 (0)