Skip to content

Commit 2d845e2

Browse files
authored
Merge pull request #533 from microsoft/release-fix
Fix release builds
2 parents 01a16d3 + 5ab84dd commit 2d845e2

File tree

7 files changed

+22
-7
lines changed

7 files changed

+22
-7
lines changed

.azure-pipelines/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33

44
variables:
55
configuration: Release
6-
signPool: VSEng-MicroBuildVS2019
6+
signPool: MSEngSS-MicroBuild2019-1ES
77
winImage: vs2017-win2016
88
osxImage: macos-latest
99

.azure-pipelines/templates/osx/pack.signed/step2-signpayload.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
steps:
2-
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
2+
- task: NuGetAuthenticate@0
3+
displayName: Authenticate to MicroBuild NuGet feed
4+
inputs:
5+
nuGetServiceConnections: 'MicroBuild Toolset Nuget Feed (Read)'
6+
7+
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@3
38
displayName: Install signing plugin
49
inputs:
510
signType: '$(SignType)'

.azure-pipelines/templates/osx/pack.signed/step4-signpack.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
steps:
2-
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
2+
- task: NuGetAuthenticate@0
3+
displayName: Authenticate to MicroBuild NuGet feed
4+
inputs:
5+
nuGetServiceConnections: 'MicroBuild Toolset Nuget Feed (Read)'
6+
7+
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@3
38
displayName: Install signing plugin
49
inputs:
510
signType: '$(SignType)'

.azure-pipelines/templates/windows/compile.signed.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
steps:
2-
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@2
2+
- task: NuGetAuthenticate@0
3+
displayName: Authenticate to MicroBuild NuGet feed
4+
inputs:
5+
nuGetServiceConnections: 'MicroBuild Toolset Nuget Feed (Read)'
6+
7+
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@3
38
displayName: Install signing plugin
49
condition: and(succeeded(), eq(variables['SignType'], 'real'))
510
inputs:

src/osx/SignFiles.Mac/SignFiles.Mac.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="MicroBuild.Core" Version="0.2.0">
15+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
1616
<!-- Development dependency only -->
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>

src/windows/Installer.Windows/Installer.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="Tools.InnoSetup" Version="6.0.5" />
22-
<PackageReference Include="MicroBuild.Core" Version="0.2.0">
22+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
2525
</ItemGroup>

src/windows/Payload.Windows/Payload.Windows.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="MicroBuild.Core" Version="0.2.0">
18+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
2121
</ItemGroup>

0 commit comments

Comments
 (0)