WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit e95647c

Browse files
ViktorHoferViktorHofer
authored
Merge pull request #1532 from dotnet/merge/release/10.0.1xx-to-release/10.0.2xx
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'
2 parents fada72b + 4172e13 commit e95647c

File tree

6 files changed

+57
-13
lines changed

6 files changed

+57
-13
lines changed

‎.github/workflows/backport.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Backport PR to branch
2+
on:
3+
issue_comment:
4+
types: [created]
5+
schedule:
6+
# once a day at 13:00 UTC to cleanup old runs
7+
- cron: '0 13 * * *'
8+
9+
permissions:
10+
contents: write
11+
issues: write
12+
pull-requests: write
13+
actions: write
14+
15+
jobs:
16+
backport:
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@main

‎.github/workflows/inter-branch-merge-flow.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Inter-branch merge workflow
2+
on:
3+
push:
4+
branches:
5+
- release/**
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
Merge:
13+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main

‎eng/Version.Details.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ This file should be imported by eng/Versions.props
99
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25571.105</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
1111
<SystemIOHashingPackageVersion>10.0.0-rc.2.25502.107</SystemIOHashingPackageVersion>
12-
<!-- dotnet/msbuild dependencies -->
13-
<MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
14-
<MicrosoftBuildTasksCorePackageVersion>17.11.31</MicrosoftBuildTasksCorePackageVersion>
1512
</PropertyGroup>
1613
<!--Property group for alternate package version names-->
1714
<PropertyGroup>
1815
<!-- dotnet/dotnet dependencies -->
1916
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
2017
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
2118
<SystemIOHashingVersion>$(SystemIOHashingPackageVersion)</SystemIOHashingVersion>
22-
<!-- dotnet/msbuild dependencies -->
23-
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
24-
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
2519
</PropertyGroup>
2620
</Project>

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<Sha>ae0ed89fe1caed1244d7633ba6e41cdd003023f7</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
16-
<Dependency Name="Microsoft.Build" Version="17.11.31">
16+
<Dependency Name="Microsoft.Build" Version="17.11.48">
1717
<Uri>https://github.com/dotnet/msbuild</Uri>
18-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
18+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.31">
20+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.48">
2121
<Uri>https://github.com/dotnet/msbuild</Uri>
22-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
22+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
2323
</Dependency>
2424
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.2.25502.107">
2525
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
<Import Project="Version.Details.props" />
44

55
<PropertyGroup>
6-
<!-- This repo version -->
7-
<VersionPrefix>10.2.0</VersionPrefix>
8-
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
6+
<VersionPrefix>10.0.200</VersionPrefix>
7+
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
8+
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11+
912
<!-- Opt-in repo features -->
1013
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1114
</PropertyGroup>
15+
1216
<PropertyGroup>
17+
<!-- msbuild -->
18+
<MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion>
19+
<MicrosoftBuildTasksCoreVersion>17.11.48</MicrosoftBuildTasksCoreVersion>
1320
<!-- nuget -->
1421
<NuGetVersioningVersion>6.12.1</NuGetVersioningVersion>
1522
<!-- runtime -->

‎github-merge-flow.jsonc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// IMPORTANT: This file is read by the merge flow from main branch only.
2+
{
3+
"merge-flow-configurations": {
4+
"release/10.0.1xx":{
5+
"MergeToBranch": "release/10.0.2xx",
6+
"ExtraSwitches": "-QuietComments"
7+
},
8+
"release/10.0.2xx":{
9+
"MergeToBranch": "main",
10+
"ExtraSwitches": "-QuietComments"
11+
}
12+
}
13+
}

0 commit comments

Comments
 (0)