Skip to content

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28392

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

Merged
merged 15 commits into from
Oct 7, 2022
Merged

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fe2506d
Switch to 7.0.2xx for loc build
marcpopMSFT Oct 3, 2022
b0fdbda
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 6, 2022
06f0705
Update dependencies from https://github.com/dotnet/msbuild build 2022…
dotnet-maestro[bot] Oct 6, 2022
3b8ece3
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 6, 2022
48fcaf6
Merge pull request #28304 from dotnet/marcpopMSFT-locbuildto702xx
nagilson Oct 6, 2022
4f3a340
Merge pull request #28371 from dotnet/darc-release/7.0.1xx-b290a7f7-1…
nagilson Oct 6, 2022
1015b43
Merge pull request #28374 from dotnet/darc-release/7.0.1xx-885c8e51-1…
nagilson Oct 6, 2022
98e60b6
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 7, 2022
dfbf786
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 7, 2022
da0cd38
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 7, 2022
a430258
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 7, 2022
129b0ed
Merge pull request #28389 from dotnet/darc-release/7.0.1xx-704f84b8-2…
nagilson Oct 7, 2022
ba4eebd
Merge pull request #28381 from dotnet/darc-release/7.0.1xx-b274861f-0…
nagilson Oct 7, 2022
b5de3a6
Merge pull request #28379 from dotnet/darc-release/7.0.1xx-1a3b9a7a-b…
nagilson Oct 7, 2022
f4ed069
Merge branch 'release/7.0.2xx' into merge/release/7.0.1xx-to-release/…
marcpopMSFT Oct 7, 2022
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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.100-rtm.22504.5">
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.100-rtm.22507.5">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>0b4eccde51cf6aadf82cfba0b2a5e4aa4200beea</Sha>
<Sha>90b4ea928260c3265949f957d9be506289d8462f</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.100-rtm.22504.5">
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.100-rtm.22507.5">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>0b4eccde51cf6aadf82cfba0b2a5e4aa4200beea</Sha>
<Sha>90b4ea928260c3265949f957d9be506289d8462f</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22507.1">
Expand Down Expand Up @@ -46,13 +46,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b8a4363ecd194d4e7906648a505701a9d2b7aeae</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22480-04">
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22506-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e1930c2ee6b16a0c5afbdc53ec51dbdda4664f80</Sha>
<Sha>20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.4.0-preview-22480-04">
<Dependency Name="Microsoft.Build.Localization" Version="17.5.0-preview-22506-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>e1930c2ee6b16a0c5afbdc53ec51dbdda4664f80</Sha>
<Sha>20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22507.1">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.4.0-preview-22480-04</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.5.0-preview-22506-03</MicrosoftBuildPackageVersion>
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
so target one that matches the version in minimumMSBuildVersion.
Expand All @@ -115,7 +115,7 @@
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion')">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.4.0-preview-22480-04</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.5.0-preview-22506-03</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
Expand All @@ -126,13 +126,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/templating -->
<MicrosoftTemplateEngineAbstractionsPackageVersion>7.0.100-rtm.22504.5</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>7.0.100-rtm.22507.5</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
<!-- test dependencies -->
<MicrosoftTemplateEngineMocksPackageVersion>7.0.100-rtm.22504.5</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineMocksPackageVersion>7.0.100-rtm.22507.5</MicrosoftTemplateEngineMocksPackageVersion>
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
</PropertyGroup>
<PropertyGroup>
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.1xx'), 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.2xx'), 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.1xx
MirrorBranch: release/7.0.2xx
MirrorRepo: sdk

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