Skip to content

Commit 3ffaf3b

Browse files
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/templating into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents c0c76f0 + 375e475 commit 3ffaf3b

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

Diff for: azure-pipelines-pr.yml

-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,8 @@ stages:
7171

7272
# Only enable publishing in non-public, non PR scenarios.
7373
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
74-
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
7574
# DotNet-Symbol-Server-Pats provides: microsoft-symbol-server-pat, symweb-symbol-server-pat
7675
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
77-
- group: DotNet-Blob-Feed
7876
- group: Publish-Build-Assets
7977
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
8078
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
@@ -87,10 +85,8 @@ stages:
8785
# PRs or external builds are not signed.
8886
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
8987
_SignType: test
90-
_DotNetPublishToBlobFeed : false
9188
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
9289
_SignType: real
93-
_DotNetPublishToBlobFeed : true
9490
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
9591
Build_Debug:
9692
_BuildConfig: Debug

Diff for: eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25202.2">
4+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23518.1">
55
<Uri>https://github.com/dotnet/source-build-externals</Uri>
6-
<Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
6+
<Sha>3dc05150cf234f76f6936dcb2853d31a0da1f60e</Sha>
77
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25210.2">
9+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24251.1">
1010
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
11-
<Sha>6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c</Sha>
11+
<Sha>6f814daa935e08b578b1c0c65a1f26ea3317f517</Sha>
1212
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1313
</Dependency>
14-
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24517.1">
14+
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23407.1">
1515
<Uri>https://github.com/dotnet/command-line-api</Uri>
16-
<Sha>31ab5077b28e4ebe8229e7d2ba8ae1307b1ce360</Sha>
16+
<Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
1717
</Dependency>
1818
</ProductDependencies>
1919
<ToolsetDependencies>

Diff for: eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<PropertyGroup>
55
<UsingToolXliff>true</UsingToolXliff>
66
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
7-
<VersionPrefix>8.0.116</VersionPrefix>
7+
<VersionPrefix>8.0.312</VersionPrefix>
88
<!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
99
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1010
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1111
<PackSpecific Condition="'$(OS)' != 'Windows_NT'">true</PackSpecific>
1212
<!-- Calculate prerelease label -->
13-
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel>
13+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
1414
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
1515
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
1616
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">
@@ -20,7 +20,7 @@
2020
<PropertyGroup>
2121
<!-- Maestro-managed Package Versions - Ordered by repo name -->
2222
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
23-
<SystemCommandLinePackageVersion>2.0.0-beta4.24517.1</SystemCommandLinePackageVersion>
23+
<SystemCommandLinePackageVersion>2.0.0-beta4.23407.1</SystemCommandLinePackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
2626
<!-- Non-maestro versions -->

0 commit comments

Comments
 (0)