Skip to content

Commit e18a292

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210524.6 (#835)
[main] Update dependencies from dotnet/arcade
1 parent 43f5000 commit e18a292

File tree

7 files changed

+49
-38
lines changed

7 files changed

+49
-38
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
</Dependency>
1616
</ProductDependencies>
1717
<ToolsetDependencies>
18-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21264.2">
18+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21274.6">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
20+
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21264.2">
22+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21274.6">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
24+
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21264.2">
26+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21274.6">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
28+
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21264.2">
30+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21274.6">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
32+
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21264.2">
34+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21274.6">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
36+
<Sha>f22435d0f9cc367e75e1875d93ef980be1be6b79</Sha>
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
3939
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
44
<!-- This repo version -->
55
<VersionPrefix>6.0.0</VersionPrefix>
66
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
7-
87
<!-- Opt-out repo features -->
98
<UsingToolXliff>false</UsingToolXliff>
10-
119
<MicrosoftNETTestSdkVersion>17.0.0-preview-20210520-02</MicrosoftNETTestSdkVersion>
12-
1310
<!-- Toolset -->
14-
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
15-
<NuGetFrameworksVersion>5.9.1</NuGetFrameworksVersion>
16-
<VsWhereVersion>2.5.2</VsWhereVersion>
17-
<MicrosoftInternalDiaInteropVersion>14.0.0</MicrosoftInternalDiaInteropVersion> <!-- keep in sync with test\UnitTests\PlatformServices.Desktop.Unit.Tests\Utilities\XmlUtilitiesTests.cs -->
18-
<MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-21064-01</MicrosoftDiaSymReaderPdb2PdbVersion>
19-
<MsTestInternalTestFxLocalizedDocumentationVersion>1.0.0-build-20170420-1</MsTestInternalTestFxLocalizedDocumentationVersion>
20-
<FmDevXlfToolVersion>0.1.3</FmDevXlfToolVersion>
21-
<VisualStudioQualityToolsUnitTestFrameworkVersion>16.9.0-preview-4267359</VisualStudioQualityToolsUnitTestFrameworkVersion>
11+
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
12+
<NuGetFrameworksVersion>5.9.1</NuGetFrameworksVersion>
13+
<VsWhereVersion>2.5.2</VsWhereVersion>
14+
<MicrosoftInternalDiaInteropVersion>14.0.0</MicrosoftInternalDiaInteropVersion>
15+
<!-- keep in sync with test\UnitTests\PlatformServices.Desktop.Unit.Tests\Utilities\XmlUtilitiesTests.cs -->
16+
<MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-21064-01</MicrosoftDiaSymReaderPdb2PdbVersion>
17+
<MsTestInternalTestFxLocalizedDocumentationVersion>1.0.0-build-20170420-1</MsTestInternalTestFxLocalizedDocumentationVersion>
18+
<FmDevXlfToolVersion>0.1.3</FmDevXlfToolVersion>
19+
<VisualStudioQualityToolsUnitTestFrameworkVersion>16.9.0-preview-4267359</VisualStudioQualityToolsUnitTestFrameworkVersion>
2220
<!-- / Toolset -->
23-
2421
<!-- Try to keep all these in sync -->
2522
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
2623
<SystemRuntimeSerializationJsonVersion>4.3.0</SystemRuntimeSerializationJsonVersion>
@@ -31,28 +28,22 @@
3128
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
3229
<SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>
3330
<!-- / Try to keep all these in sync -->
34-
3531
<SystemCollectionsImmutableVersion>1.6.0</SystemCollectionsImmutableVersion>
3632
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
37-
3833
<!-- UWP and WinUI dependencies -->
3934
<MicrosoftNETCoreUniversalWindowsPlatformVersion>5.3.0</MicrosoftNETCoreUniversalWindowsPlatformVersion>
4035
<MicrosoftProjectReunionVersion>0.5.0</MicrosoftProjectReunionVersion>
4136
<!-- / UWP and WinUI dependencies -->
42-
4337
<MoqVersion>4.8.3</MoqVersion>
4438
<CastleCoreVersion>4.3.0</CastleCoreVersion>
4539
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
4640
<StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
47-
4841
<!-- These are used to test compability with legacy MSTest, please do not update -->
49-
<Legacy__MicrosoftNETTestSdkVersion>15.7.0</Legacy__MicrosoftNETTestSdkVersion>
50-
<Legacy__MSTestTestAdapterVersion>1.2.0</Legacy__MSTestTestAdapterVersion>
51-
<Legacy__MSTestTestFrameworkVersion>1.2.0</Legacy__MSTestTestFrameworkVersion>
42+
<Legacy__MicrosoftNETTestSdkVersion>15.7.0</Legacy__MicrosoftNETTestSdkVersion>
43+
<Legacy__MSTestTestAdapterVersion>1.2.0</Legacy__MSTestTestAdapterVersion>
44+
<Legacy__MSTestTestFrameworkVersion>1.2.0</Legacy__MSTestTestFrameworkVersion>
5245
<!-- / These are used to test compability with legacy MSTest, please do not update -->
53-
5446
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
55-
5647
<!-- Libs -->
5748
<CommandLineParserVersion>2.2.1</CommandLineParserVersion>
5849
<CredentialManagementVersion>1.0.2</CredentialManagementVersion>
@@ -106,8 +97,8 @@
10697
<XUnitVersion>2.4.1</XUnitVersion>
10798
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
10899
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
109-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksFeedVersion>
110-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21264.2</MicrosoftDotNetSignToolVersion>
100+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21274.6</MicrosoftDotNetBuildTasksFeedVersion>
101+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21274.6</MicrosoftDotNetSignToolVersion>
111102
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
112103
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
113104
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -117,7 +108,7 @@
117108
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
118109
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkGitHubVersion>
119110
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkAzureReposGitVersion>
120-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21264.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
111+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21274.6</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
121112
<XliffTasksVersion>1.0.0-beta.21265.1</XliffTasksVersion>
122113
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.21228.1</MicrosoftDotNetMaestroTasksVersion>
123114
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>

‎eng/common/templates/job/source-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ parameters:
1515
# nonPortable: false
1616
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
1717
# linux-x64), and compiling against distro-provided packages rather than portable ones.
18+
# skipPublishValidation: false
19+
# Disables publishing validation. By default, a check is performed to ensure no packages are
20+
# published by source-build.
1821
# container: ''
1922
# A container to use. Runs in docker.
2023
# pool: {}

‎eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ stages:
4040
pool:
4141
vmImage: 'windows-2019'
4242
steps:
43+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
44+
displayName: Warn about v2 Arcade Publishing Usage
45+
4346
# This is necessary whenever we want to publish/restore to an AzDO private feed
4447
- task: NuGetAuthenticate@0
4548
displayName: 'Authenticate to AzDO Feeds'
@@ -110,6 +113,9 @@ stages:
110113
pool:
111114
vmImage: 'windows-2019'
112115
steps:
116+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
117+
displayName: Warn about v2 Arcade Publishing Usage
118+
113119
- task: DownloadBuildArtifacts@0
114120
displayName: Download Build Assets
115121
continueOnError: true

‎eng/common/templates/post-build/channels/generic-public-channel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ stages:
4242
pool:
4343
vmImage: 'windows-2019'
4444
steps:
45+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
46+
displayName: Warn about v2 Arcade Publishing Usage
47+
4548
- task: DownloadBuildArtifacts@0
4649
displayName: Download Build Assets
4750
continueOnError: true
@@ -109,6 +112,9 @@ stages:
109112
pool:
110113
vmImage: 'windows-2019'
111114
steps:
115+
- script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
116+
displayName: Warn about v2 Arcade Publishing Usage
117+
112118
- task: DownloadBuildArtifacts@0
113119
displayName: Download Build Assets
114120
continueOnError: true

‎eng/common/templates/steps/source-build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ steps:
3434
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3535
fi
3636
37+
publishArgs=
38+
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
39+
publishArgs='--publish'
40+
fi
41+
3742
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
3843
--configuration $buildConfig \
39-
--restore --build --pack --publish -bl \
44+
--restore --build --pack $publishArgs -bl \
4045
$officialBuildArgs \
4146
$targetRidArgs \
4247
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"vswhere": "2.5.2"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21274.6"
1717
}
1818
}

0 commit comments

Comments
 (0)