Skip to content

Commit aa72654

Browse files
rainersigwaldrainersigwald
authored
Merge pull request #357 from microsoft/main
Changes for the 1.10 release series.
2 parents 694ff39 + a349ee7 commit aa72654

6 files changed

Lines changed: 95 additions & 6 deletions

File tree

‎Directory.Build.props‎

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

3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
32-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="all" />
32+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" PrivateAssets="all" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎azure-pipelines.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
displayName: 'Upload logs to drop'
5858
targetPath: '$(Build.ArtifactStagingDirectory)\logs'
5959
artifactName: logs
60-
condition: succeededOrFailed()
60+
condition: always()
6161
steps:
6262
- task: MicroBuildSigningPlugin@4
6363
displayName: Install MicroBuild plugin
@@ -107,6 +107,7 @@ extends:
107107

108108
- task: CopyFiles@2
109109
displayName: 'Copy logs to drop'
110+
condition: always()
110111
inputs:
111112
Contents: '**\*.*log'
112113
TargetFolder: '$(Build.ArtifactStagingDirectory)\logs'

‎release-pipeline.yml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
trigger: none
2+
3+
resources:
4+
pipelines:
5+
- pipeline: microsoft_MSBuildLocator
6+
source: microsoft.MSBuildLocator
7+
trigger:
8+
enabled: false
9+
10+
variables:
11+
SymbolsAgentPath: '$(System.DefaultWorkingDirectory)\_$(Build.DefinitionName)\Symbols'
12+
SymbolsFeatureName: 'MSBuild'
13+
SymbolsProject: 'DDE'
14+
TeamName: 'msbuild'
15+
VstsDropNames: 'Products/DevDiv/Microsoft/msbuild/$(Build.SourceBranchName)/$(Build.BuildNumber)/$(Build.BuildId)'
16+
17+
stages:
18+
- stage: RetainBuild
19+
displayName: 'Retain build'
20+
jobs:
21+
- job: RetainBuildJob
22+
displayName: 'Run on agent'
23+
pool:
24+
name: 'VSEngSS-MicroBuild2022-1ES'
25+
steps:
26+
- task: MicroBuildArchiveSymbols@6
27+
displayName: 'Archive $(SymbolsFeatureName) on Symweb'
28+
inputs:
29+
SymbolsFeatureName: '$(SymbolsFeatureName)'
30+
SymbolsProject: '$(SymbolsProject)'
31+
SymbolsAgentPath: '$(SymbolsAgentPath)'
32+
SubmitToInternet: true
33+
ExpirationInDays: '5475'
34+
azureSubscription: 'VSEng-SymbolsUpload'
35+
env:
36+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
37+
38+
- task: MicroBuildRetainVstsDrops@1
39+
displayName: 'Retain VSTS Drops'
40+
enabled: false
41+
inputs:
42+
DropNames: '$(VstsDropNames)'
43+
DropServiceUri: 'https://devdiv.artifacts.visualstudio.com/DefaultCollection'
44+
45+
- stage: PublicRelease
46+
displayName: 'Public release'
47+
dependsOn: RetainBuild
48+
condition: succeeded()
49+
jobs:
50+
- job: PushToNuGet
51+
displayName: 'Push to nuget.org'
52+
pool:
53+
name: 'VSEngSS-MicroBuild2022-1ES'
54+
steps:
55+
- task: NuGetCommand@2
56+
displayName: 'NuGet push'
57+
inputs:
58+
command: 'push'
59+
packagesToPush: '$(Pipeline.Workspace)/microsoft_MSBuildLocator/pkg/Microsoft.Build.Locator*.nupkg'
60+
nuGetFeedType: 'external'
61+
publishFeedCredentials: 'MSBuild-Locator'
62+
verbosityPush: 'Detailed'
63+
64+
- job: PublicNuGetRelease
65+
displayName: 'Public NuGet release'
66+
dependsOn: PushToNuGet
67+
pool: server
68+
steps:
69+
- task: ManualValidation@0
70+
displayName: 'Push packages to NuGet'
71+
inputs:
72+
instructions: |
73+
https://microsoft.sharepoint.com/teams/toolsforeng/_layouts/OneNote.aspx?id=%2Fteams%2Ftoolsforeng%2FOne%20Note%2FToolsForSoftwareEngineers&wd=target%28Build%20Tools%2FMSBuild%2FGitHub.one%7CFF6DC598-65EC-43D5-AB29-DB38FEB82BC8%2FMyGet%20Feed%7CFAFC6258-899D-48D4-8DB4-892396202C9C%2F%29
74+
onenote:https://microsoft.sharepoint.com/teams/toolsforeng/One%20Note/ToolsForSoftwareEngineers/Build%20Tools/MSBuild/GitHub.one#MyGet%20Feed&section-id={FF6DC598-65EC-43D5-AB29-DB38FEB82BC8}&page-id={FAFC6258-89
75+
onTimeout: 'reject'
76+
77+
- job: GitHubRelease
78+
displayName: 'GitHub release'
79+
dependsOn: PublicNuGetRelease
80+
pool: server
81+
steps:
82+
- task: ManualValidation@0
83+
displayName: 'Create GitHub release'
84+
inputs:
85+
instructions: 'Create the GitHub release manually'
86+
onTimeout: 'reject'

‎src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<AssemblyOriginatorKeyFile>..\MSBuildLocator\key.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
1010
<PackageReference Include="Shouldly" Version="4.3.0" />
1111
<PackageReference Include="xunit" Version="2.9.3" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\MSBuildLocator\Microsoft.Build.Locator.csproj" />

‎src/MSBuildLocator/Microsoft.Build.Locator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<DefineConstants>$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
2121
</PropertyGroup>
2222
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
23-
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" PrivateAssets="all" />
2424
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
2525
</ItemGroup>
2626
<ItemGroup>

‎src/MSBuildLocator/build/Microsoft.Build.Locator.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
'%(PackageReference.Identity)' == 'Microsoft.Build.Conversion.Core' or
1414
'%(PackageReference.Identity)' == 'Microsoft.Build.Runtime' or
1515
'%(PackageReference.Identity)' == 'Microsoft.Build.Localization' or
16-
'%(PackageReference.Identity)' == 'Microsoft.Build.Engine'
16+
'%(PackageReference.Identity)' == 'Microsoft.Build.Engine' or
17+
'%(PackageReference.Identity)' == 'Microsoft.NET.StringTools' or
18+
'%(PackageReference.Identity)' == 'NuGet.Frameworks'
1719
)"/>
1820
</ItemGroup>
1921
<Error

0 commit comments

Comments
 (0)