Skip to content

[automated] Merge branch 'release/7.0.2xx' => 'main' #29980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dotnet-maestro-bot wants to merge 12 commits into from
Closed

[automated] Merge branch 'release/7.0.2xx' => 'main' #29980

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
96e9be7
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Jan 13, 2023
3e7ce77
[release/7.0.1xx] Update dependencies from dotnet/roslyn (#29919)
v-wuzhai Jan 13, 2023
b8ec9f7
Make PublishAot an optional feature because Mono does not support it.…
tmds Jan 13, 2023
46b72c1
This call is failing on the Darwin leg in installer. (#29916)
nagilson Jan 12, 2023
574ebca
Update to stable rtm branding
marcpopMSFT Jan 13, 2023
1ed17ce
Update loc build for 7.0.3xx
marcpopMSFT Jan 13, 2023
6f39d0c
This call is failing on the Darwin leg in installer. (#29916) (#29939)
nagilson Jan 16, 2023
436d932
Merge branch 'release/7.0.1xx' into release/7.0.2xx
Jan 16, 2023
3c67d12
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#29952)
dsplaisted Jan 16, 2023
8dd7b91
Stable branding for 7.0.200 GA release (#29942)
marcpopMSFT Jan 17, 2023
4a5769a
Merge branch 'release/7.0.2xx'
Jan 18, 2023
2472047
port templating changes
YuliiaKovalova Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<!-- Repo Version Information -->
<PropertyGroup>
<VersionPrefix>7.0.200</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<!-- Production Dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions eng/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ parameters:
timeoutInMinutes: 180

jobs:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.2xx'), not(contains(parameters.agentOs, 'TemplateEngine'))) }}:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.3xx'), not(contains(parameters.agentOs, 'TemplateEngine'))) }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
CreatePr: true
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-DOTNETSDK'
MirrorBranch: release/7.0.2xx
MirrorBranch: release/7.0.3xx
MirrorRepo: sdk

- ${{ if not(contains(parameters.agentOs, 'TemplateEngine')) }}:
Expand Down