Skip to content

Commit fc3eaec

Browse files
heathsheaths
committed
Publish signed pre-release builds
1 parent dfa7a4e commit fc3eaec

10 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎.vsts-ci.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@ trigger:
66
branches:
77
include:
88
- master
9+
- develop
10+
paths:
11+
exclude:
12+
- README.md
913

1014
pr: none
1115

1216
queue:
1317
name: VSEng-MicroBuildVS2017
1418
timeoutInMinutes: 120
1519
demands:
16-
- msbuild
17-
- visualstudio
18-
- vstest
20+
- MSBuild
21+
- VisualStudio
22+
- VSTest
1923

2024
steps:
2125
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Visual Studio Setup PowerShell Module
33

44
![build status: master](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/Setup/Setup-VSSetup.PowerShell-CI?branchName=master&label=master)
55
[![build status: develop](https://dev.azure.com/azure-public/vssetup/_apis/build/status/Microsoft.vssetup.powershell?branchName=develop&label=develop)](https://dev.azure.com/azure-public/vssetup/_build/latest?definitionId=23?branchName=develop)
6-
[![github release](https://img.shields.io/github/release/Microsoft/VSSetup.PowerShell.svg?logo=github)](https://github.com/Microsoft/VSSetup.PowerShell/releases/latest)
7-
[![github releases: all](https://img.shields.io/github/downloads/Microsoft/VSSetup.PowerShell/total.svg?logo=github&label=github)](https://github.com/Microsoft/VSSetup.PowerShell/releases)
8-
[![PowerShell Gallery](https://img.shields.io/powershellgallery/dt/VSSetup.svg)](https://powershellgallery.com/packages/VSSetup)
6+
[![github release](https://img.shields.io/github/release/Microsoft/VSSetup.PowerShell.svg?logo=github&logoColor=white)](https://github.com/Microsoft/VSSetup.PowerShell/releases/latest)
7+
[![github releases: all](https://img.shields.io/github/downloads/Microsoft/VSSetup.PowerShell/total.svg?logo=github&logoColor=white&label=github)](https://github.com/Microsoft/VSSetup.PowerShell/releases)
8+
[![PowerShell Gallery](https://img.shields.io/powershellgallery/dt/VSSetup.svg?logo=powershell&logoColor=white&label=gallery)](https://powershellgallery.com/packages/VSSetup)
99

1010
This PowerShell module contains cmdlets to query instances of Visual Studio 2017 and newer. It also serves as a more useful sample of using the Setup Configuration APIs than the previously [published samples][samples] though those also have samples using VB and VC++.
1111

‎azure-pipelines.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# Copyright (C) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT license. See LICENSE.txt in the project root for license information.
33

4-
trigger:
5-
batch: true
6-
branches:
7-
include:
8-
- develop
4+
trigger: none
95

106
pr:
117
branches:
128
include:
13-
- master
14-
- develop
9+
- master
10+
- develop
11+
paths:
12+
exclude:
13+
- README.md
1514

1615
pool:
1716
vmImage: vs2017-win2016

‎build/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ steps:
9999
packagesToPack: pkg\VSSetup\VSSetup.nuspec
100100
configuration: ${{ parameters.BuildConfiguration }}
101101
versioningScheme: byEnvVar
102-
versionEnvVar: GitBuildVersionSimple
102+
versionEnvVar: NBGV_NuGetPackageVersion
103103
includeSymbols: true
104-
buildProperties: CommitId=$(Build.SourceVersion)
104+
buildProperties: CommitId=$(Build.SourceVersion);Tag=$(Build.BuildNumber)
105105

106106
- ${{ if eq(parameters.Sign, 'true') }}:
107107
- task: VSBuild@1

‎pkg/VSSetup/VSSetup.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<summary>Visual Studio Setup PowerShell Module</summary>
1515
<copyright>Copyright (C) Microsoft Corporation. All rights reserved.</copyright>
1616
<tags>PSModule PSIncludes_Cmdlet PSCmdlet_Get-VSSetupInstance PSCmdlet_Select-VSSetupInstance PSCommand_Get-VSSetupInstance PSCommand_Select-VSSetupInstance</tags>
17-
<releaseNotes>https://github.com/Microsoft/vssetup.powershell/releases/tag/$Version$</releaseNotes>
17+
<releaseNotes>https://github.com/Microsoft/vssetup.powershell/releases/tag/$Tag$</releaseNotes>
1818
</metadata>
1919
<files>
2020
<file src="LICENSE.txt" target="tools\"/>

‎src/VSSetup.PowerShell/VSSetup.PowerShell.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
</PropertyGroup>
113113
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props'))" />
114114
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets'))" />
115-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets'))" />
115+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets'))" />
116116
</Target>
117117
<Target Name="PopulateFilesToSign" AfterTargets="AfterBuild" BeforeTargets="SignFiles">
118118
<ItemGroup>
@@ -125,5 +125,5 @@
125125
</ItemGroup>
126126
</Target>
127127
<Import Project="..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')" />
128-
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets')" />
128+
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets')" />
129129
</Project>

‎src/VSSetup.PowerShell/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<package id="MicroBuild.Core" version="0.3.0" targetFramework="net35" developmentDependency="true" />
44
<package id="Microsoft.PowerShell.2.ReferenceAssemblies" version="1.0.0" targetFramework="net35" />
55
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.11.2290" targetFramework="net35" developmentDependency="true" />
6-
<package id="Nerdbank.GitVersioning" version="2.1.58" targetFramework="net35" developmentDependency="true" />
6+
<package id="Nerdbank.GitVersioning" version="2.3.38" targetFramework="net35" developmentDependency="true" />
77
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net35" developmentDependency="true" />
88
</packages>

‎test/VSSetup.PowerShell.Test/VSSetup.PowerShell.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
124124
</PropertyGroup>
125125
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
126-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets'))" />
126+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets'))" />
127127
</Target>
128-
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.58\build\Nerdbank.GitVersioning.targets')" />
128+
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.3.38\build\Nerdbank.GitVersioning.targets')" />
129129
</Project>

‎test/VSSetup.PowerShell.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.PowerShell.2.ReferenceAssemblies" version="1.0.0" targetFramework="net45" />
55
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.11.2290" targetFramework="net45" />
66
<package id="Moq" version="4.5.30" targetFramework="net45" />
7-
<package id="Nerdbank.GitVersioning" version="2.1.58" targetFramework="net45" developmentDependency="true" />
7+
<package id="Nerdbank.GitVersioning" version="2.3.38" targetFramework="net45" developmentDependency="true" />
88
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net45" developmentDependency="true" />
99
<package id="xunit" version="2.1.0" targetFramework="net45" />
1010
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

‎version.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"version": "2.2",
44
"publicReleaseRefSpec": [
55
"^refs/heads/master$",
6-
"^refs/tags/v\\d\\.\\d"
6+
"^refs/tags/v\\d+\\.\\d+"
77
],
88
"cloudBuild": {
9+
"setAllVariables": true,
910
"buildNumber": {
1011
"enabled": true
1112
}

0 commit comments

Comments
 (0)