Skip to content

Conversation

@sfoslund
Copy link
Member

@sfoslund sfoslund commented Jun 25, 2020

Fixes #11231
Fixes #11232
Fixes #11233 (See normalization)

dotnet-maestro bot and others added 30 commits May 20, 2020 00:51
….11 (dotnet#4573)

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20269.8 -> To Version 3.1.400-preview.20269.11

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…5.7.0.6618 (dotnet#13366)

NuGet.Build.Tasks
 From Version 5.7.0-preview.1.6609 -> To Version 5.7.0-preview.2.6618

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/sdk build 20200519.8

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20263.9 -> To Version 3.1.400-preview.20269.8

* Update dependencies from https://github.com/dotnet/sdk build 20200519.11

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20263.9 -> To Version 3.1.400-preview.20269.11

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…519.3 (dotnet#13370)

Microsoft.DotNet.Arcade.Sdk
 From Version 1.0.0-beta.20269.1 -> To Version 1.0.0-beta.20269.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…5.7.0.6618 (dotnet#4564)

NuGet.Build.Tasks
 From Version 5.7.0-preview.1.6609 -> To Version 5.7.0-preview.2.6618

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….1 (dotnet#4578)

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20269.3 -> To Version 3.1.400-preview.20270.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….2 (dotnet#4579)

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20270.1 -> To Version 3.1.400-preview.20270.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0200520.3 (dotnet#4581)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20224-01 -> To Version 16.7.0-preview-20270-03

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…4584)

* Update dependencies from https://github.com/microsoft/msbuild build 20200521.1

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20270-03 -> To Version 16.7.0-preview-20271-01

* Update dependencies from https://github.com/microsoft/msbuild build 20200521.2

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20270-03 -> To Version 16.7.0-preview-20271-02

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0200521.3 (dotnet#4585)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20271-02 -> To Version 16.7.0-preview-20271-03

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…#11696)

* Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6618

NuGet.Build.Tasks
 From Version 5.7.0-preview.1.6609 -> To Version 5.7.0-preview.2.6618

* Update stage 0

* Update global.json

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jacques Eloff <[email protected]>
Co-authored-by: William Li <[email protected]>
….7 (dotnet#4586)

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20269.11 -> To Version 3.1.400-preview.20271.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….7 (dotnet#13376)

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20269.11 -> To Version 3.1.400-preview.20271.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….9 (dotnet#4587)

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20270.2 -> To Version 3.1.400-preview.20271.9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0200526.1 (dotnet#4588)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20271-03 -> To Version 16.7.0-preview-20276-01

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…528.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool
 From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5
…528.5

Microsoft.DotNet.Arcade.Sdk
 From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5
…528.5

Microsoft.DotNet.Arcade.Sdk
 From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5
…0200529.1 (dotnet#4590)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20276-01 -> To Version 16.7.0-preview-20279-01

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0200529.3 (dotnet#4591)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20279-01 -> To Version 16.7.0-preview-20279-03

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0200529.2

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20279-03 -> To Version 16.7.0-preview-20279-02
…0200529.4

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20279-03 -> To Version 16.7.0-preview-20279-04
…0200529.5

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20279-03 -> To Version 16.7.0-preview-20279-05
…684-964f-4d3a-8a02-00e49a44a1cc

[release/3.1.4xx] Update dependencies from Microsoft/msbuild
….1 (dotnet#4593)

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20271.9 -> To Version 3.1.400-preview.20301.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…601.10

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool
 From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20301.10
dotnet-maestro bot and others added 15 commits July 18, 2020 06:13
…0200717.16 (dotnet#12552)

Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers
 From Version 5.0.0-rc.1.20367.15 -> To Version 5.0.0-rc.1.20367.16

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0717.23 (dotnet#12554)

System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.App.Ref , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages
 From Version 5.0.0-rc.1.20366.14 -> To Version 5.0.0-rc.1.20367.23

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…717.6 (dotnet#12555)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20361.3 -> To Version 11.0.0-beta.20367.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/cli build 20200717.1

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20365.4 -> To Version 3.1.400-preview.20367.1

* Update dependencies from https://github.com/dotnet/cli build 20200717.2

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20365.4 -> To Version 3.1.400-preview.20367.2

* Remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <[email protected]>
…0200717.6 (dotnet#12545)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.8.0-preview-20366-02 -> To Version 16.8.0-preview-20367-06

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…uild 20200720.1 (dotnet#12557)

Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.0-beta2.20360.2 -> To Version 3.3.0-beta3.20370.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 Conflicts:
	eng/Version.Details.xml
	eng/Versions.props
 Conflicts:
	NuGet.config
	eng/Version.Details.xml
	eng/Versions.props
	eng/common/templates/post-build/post-build.yml
	global.json
Merge 3.1.4xx branches to 5.0.100/master
@sfoslund
Copy link
Member Author

@wli3 @dsplaisted I've filed #12560 to track removing the xcopy work around and reenabling c++ full framework tests once the new image is available. Do either of you have any more feedback or is this good to go in?

@wli3
Copy link

wli3 commented Jul 21, 2020

I am all good

@wli3
Copy link

wli3 commented Jul 21, 2020

@sfoslund could we merge it? I want to change tests to use net5.0-blah

@sfoslund sfoslund changed the base branch from master to release/5.0.1xx-preview8 July 23, 2020 17:31
@sfoslund sfoslund requested a review from vijayrkn as a code owner July 23, 2020 17:31
@sfoslund
Copy link
Member Author

Closing this one in favor of #12612, since we're targeting prev 8 now.

@sfoslund sfoslund closed this Jul 23, 2020
@sfoslund sfoslund deleted the ParseTargetPlatform branch July 24, 2020 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet