Skip to content

[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' #28447

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 8 commits into from
Oct 11, 2022
Merged

[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' #28447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c7675d
Expand existing warning to target 5.0
marcpopMSFT Sep 15, 2022
9d53461
Update windows images for release/6.0.1xx
Sep 27, 2022
c8c0b57
Update branding to 6.0.306
vseanreesermsft Oct 4, 2022
1fb9866
Merge pull request #28194 from dotnet/Jason/UpdateImagesFor601xx
marcpopMSFT Oct 10, 2022
f0fd3d7
Merge pull request #27943 from dotnet/marcpopMSFT-warnonoostargeting6…
marcpopMSFT Oct 10, 2022
8d381c6
Merge pull request #28439 from dotnet-maestro-bot/merge/release/6.0.1…
marcpopMSFT Oct 11, 2022
f430fc3
Merge pull request #28323 from vseanreesermsft/branding-6.0.306-2022-…
marcpopMSFT Oct 11, 2022
1ffe2b1
Merge branch 'release/6.0.3xx' into release/6.0.4xx
Oct 11, 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
2 changes: 1 addition & 1 deletion .vsts-ci-richnav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stages:
richCodeNavigationEnvironment: 'production'
pool:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals windows.vs2019.amd64.open
timeoutInMinutes: 180
strategy:
matrix:
Expand Down
18 changes: 9 additions & 9 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
demands: ImageOverride -equals windows.vs2019.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
artifact: BuildConfiguration
Expand All @@ -55,10 +55,10 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
demands: ImageOverride -equals windows.vs2022preview.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
demands: ImageOverride -equals windows.vs2022preview.amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
Expand Down Expand Up @@ -86,10 +86,10 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
demands: ImageOverride -equals windows.vs2022preview.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
demands: ImageOverride -equals windows.vs2022preview.amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
Expand All @@ -113,10 +113,10 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals windows.vs2019.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
demands: ImageOverride -equals windows.vs2019.amd64
strategy:
matrix:
Build_Debug:
Expand Down Expand Up @@ -172,7 +172,7 @@ stages:
- Source_Build_Managed
pool:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
demands: ImageOverride -equals windows.vs2019.amd64
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/templates/post-build/post-build.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Copyright (c) .NET Foundation. All rights reserved.
receive servicing updates and security fixes.
-->
<ItemGroup>
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0" />
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;5.0" />
</ItemGroup>

<Target Name="_CheckForEolTargetFrameworks" AfterTargets="_CheckForUnsupportedNETCoreVersion"
Expand Down
1 change: 1 addition & 0 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public GivenThatWeWantToTargetEolFrameworks(ITestOutputHelper log) : base(log)
[InlineData("netcoreapp1.0")]
[InlineData("netcoreapp3.0")]
[InlineData("netcoreapp2.1")]
[InlineData("net5.0")]
public void It_warns_that_framework_is_out_of_support(string targetFrameworks)
{
var testProject = new TestProject()
Expand Down