Skip to content

Commit 9df3f9f

Browse files
author
Mirroring
committed
Merge commit 'f53d3ef2050193a468dd8d3084100881bd0489a6'
2 parents 1022635 + f53d3ef commit 9df3f9f

File tree

14 files changed

+62
-80
lines changed

14 files changed

+62
-80
lines changed

‎NuGet.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-aspnetcore -->
2323
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
24-
<add key="darc-pub-DotNet-msbuild-Trusted-c3ade83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c3ade832/nuget/v3/index.json" />
24+
<add key="darc-pub-DotNet-msbuild-Trusted-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" />
2525
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2626
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2727
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -30,6 +30,8 @@
3030
<!-- End: Package sources from dotnet-runtime -->
3131
<!-- Begin: Package sources from dotnet-templating -->
3232
<add key="darc-pub-dotnet-templating-a977119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-templating-a977119-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e-1/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-templating-0da2c6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0da2c6ec/nuget/v3/index.json" />
3335
<!-- End: Package sources from dotnet-templating -->
3436
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3537
<add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.114">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.115">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a977119e0201a0270ac119b429661bbd71993221</Sha>
6+
<Sha>0da2c6ec19a265dd1478a9fb736c02117c907179</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.114-servicing.25111.6">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25156.8">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a977119e0201a0270ac119b429661bbd71993221</Sha>
10+
<Sha>0da2c6ec19a265dd1478a9fb736c02117c907179</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.114-servicing.25111.6">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25156.8">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>a977119e0201a0270ac119b429661bbd71993221</Sha>
14+
<Sha>0da2c6ec19a265dd1478a9fb736c02117c907179</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.19">
58+
<Dependency Name="Microsoft.Build" Version="17.8.22">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
60+
<Sha>bfbb05667061fc94ba2d135e28e3827161947b95</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.19-preview-25071-04">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.22-preview-25121-01">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
64+
<Sha>bfbb05667061fc94ba2d135e28e3827161947b95</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.19-preview-25071-04">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.22-preview-25121-01">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>c3ade832ad989bc4258b064bedc866742b873a12</Sha>
68+
<Sha>bfbb05667061fc94ba2d135e28e3827161947b95</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
@@ -293,16 +293,16 @@
293293
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
294294
<Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25104.6">
296+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25123.5">
297297
<Uri>https://github.com/dotnet/razor</Uri>
298298
<Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
299299
<SourceBuild RepoName="razor" ManagedOnly="true" />
300300
</Dependency>
301-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25104.6">
301+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25123.5">
302302
<Uri>https://github.com/dotnet/razor</Uri>
303303
<Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25104.6">
305+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25123.5">
306306
<Uri>https://github.com/dotnet/razor</Uri>
307307
<Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
308308
</Dependency>
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25111.4">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
496+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25111.4">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25114.5">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
501+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25111.4">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25114.5">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
505+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25111.4">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25114.5">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>a319ada170a54ee87c7a81e3309948e3d3ea7aca</Sha>
509+
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25111.4</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25114.5</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.19</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.22</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,20 +130,20 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.19-preview-25071-04</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.22-preview-25121-01</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/dotnet/templating -->
140-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.114</MicrosoftTemplateEngineAbstractionsPackageVersion>
140+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.115</MicrosoftTemplateEngineAbstractionsPackageVersion>
141141
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
142142
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
143143
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
144144
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
145145
<!-- test dependencies -->
146-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.114-servicing.25111.6</MicrosoftTemplateEngineMocksPackageVersion>
146+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25156.8</MicrosoftTemplateEngineMocksPackageVersion>
147147
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
148148
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
149149
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -175,9 +175,9 @@
175175
</PropertyGroup>
176176
<!-- Dependencies from https://github.com/dotnet/razor -->
177177
<PropertyGroup>
178-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25104.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
179-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25104.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
180-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25104.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
178+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25123.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
179+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25123.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
180+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25123.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
181181
</PropertyGroup>
182182
<PropertyGroup>
183183
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25111.4</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25114.5</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/templates-official/steps/send-to-helix.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1010
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
11+
HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
1112
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1213
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1314
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
2425
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2526
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2627
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
27-
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
28+
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2829
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2930
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3031

3132
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
33+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3334
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3435
env:
3536
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
5960
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6061
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6162
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
63+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6364
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6465
env:
6566
BuildConfig: $(_BuildConfig)

‎eng/common/templates/steps/send-to-helix.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
HelixConfiguration: '' # optional -- additional property attached to a job
99
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
1010
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
11+
HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
1112
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1213
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
1314
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
2425
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2526
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
2627
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
27-
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
28+
DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
2829
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
2930
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
3031

3132
steps:
32-
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
33+
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
3334
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
3435
env:
3536
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
5960
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6061
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
6162
continueOnError: ${{ parameters.continueOnError }}
62-
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
63+
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
6364
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
6465
env:
6566
BuildConfig: $(_BuildConfig)

0 commit comments

Comments
 (0)