Skip to content

Commit

Permalink
Merge preview 7 to preview 8 (#12577)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/templating build 20200622.1

Microsoft.TemplateEngine.Cli
 From Version 5.0.0-preview.8.20322.2 -> To Version 5.0.0-preview.7.20322.1

* Update dependencies from https://github.com/dotnet/runtime build 20200622.6

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200617.1 (#12147)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20310-07 -> To Version 16.7.0-preview-20317-01

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

* Update dependencies from https://github.com/dotnet/runtime build 20200623.4

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200623.3 (#12155)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20322.7 -> To Version 10.10.0-beta.20323.3

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

* [release/5.0.1xx-preview7] Update dependencies from nuget/nuget.client (#12148)

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

NuGet.Build.Tasks
 From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6668

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

NuGet.Build.Tasks
 From Version 5.7.0-preview.3.6653 -> To Version 5.7.0-rtm.6670

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

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200623.6 (#12161)

Microsoft.WindowsDesktop.App
 From Version 5.0.0-preview.7.20311.4 -> To Version 5.0.0-preview.7.20323.6

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 5.0.0-preview.7.20311.4 -> To Version 5.0.0-preview.7.20323.3 (parent: Microsoft.WindowsDesktop.App

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

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200623.9 (#12163)

Microsoft.WindowsDesktop.App
 From Version 5.0.0-preview.7.20323.6 -> To Version 5.0.0-preview.7.20323.9

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 5.0.0-preview.7.20323.3 -> To Version 5.0.0-preview.7.20323.5 (parent: Microsoft.WindowsDesktop.App

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

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200624.1 (#12169)

Microsoft.WindowsDesktop.App
 From Version 5.0.0-preview.7.20323.9 -> To Version 5.0.0-preview.7.20324.1

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 5.0.0-preview.7.20323.5 -> To Version 5.0.0-preview.7.20323.9 (parent: Microsoft.WindowsDesktop.App

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200623.1 (#12150)

Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers
 From Version 5.0.0-preview.7.20311.11 -> To Version 5.0.0-preview.7.20323.1

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

* [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12176)

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200623.3

Microsoft.AspNetCore.Analyzers , Microsoft.NET.Sdk.Razor , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers
 From Version 5.0.0-preview.7.20323.1 -> To Version 5.0.0-preview.7.20323.3

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200623.9

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-preview.7.20323.3 -> To Version 5.0.0-preview.7.20323.9

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200623.1 (#12158)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20317-01 -> To Version 16.7.0-preview-20323-01

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

* Work around for runtime pack profiles with differing runtime IDs

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200625.9 (#12220)

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-preview.7.20323.9 -> To Version 5.0.0-preview.7.20325.9

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200626.1 (#12219)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20323.3 -> To Version 10.10.0-beta.20326.1

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

* Update dependencies from https://github.com/dotnet/runtime build 20200626.1 (#12221)

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

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

* [release/5.0.1xx-preview7] Update dependencies from microsoft/msbuild (#12218)

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

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20323-01 -> To Version 16.7.0-preview-20326-01

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

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20323-01 -> To Version 16.7.0-preview-20326-06

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

* [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12223)

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.3

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-preview.7.20325.9 -> To Version 5.0.0-preview.7.20326.3

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.5

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-preview.7.20325.9 -> To Version 5.0.0-preview.7.20326.5

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200626.3 (#12225)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20326.1 -> To Version 10.10.0-beta.20326.3

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

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200626.3 (#12229)

Microsoft.WindowsDesktop.App
 From Version 5.0.0-preview.7.20324.1 -> To Version 5.0.0-preview.7.20326.3

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 5.0.0-preview.7.20323.9 -> To Version 5.0.0-preview.7.20326.3 (parent: Microsoft.WindowsDesktop.App

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

* [release/5.0.1xx-preview7] Update dependencies from microsoft/msbuild (#12226)

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

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20326-06 -> To Version 16.7.0-preview-20326-02

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

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

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

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20326-03 -> To Version 16.7.0-preview-20326-05

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

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20326-05 -> To Version 16.7.0-preview-20326-04

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.10 (#12235)

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-preview.7.20326.5 -> To Version 5.0.0-preview.7.20326.10

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

* [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12237)

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.12

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-preview.7.20326.10 -> To Version 5.0.0-preview.7.20326.12

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200626.13

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-preview.7.20326.10 -> To Version 5.0.0-preview.7.20326.13

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200627.5 (#12244)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20326.3 -> To Version 10.10.0-beta.20327.5

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200628.2 (#12250)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20327.5 -> To Version 10.10.0-beta.20328.2

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200628.3 (#12252)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20328.2 -> To Version 10.10.0-beta.20328.3

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200629.1 (#12258)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20328.3 -> To Version 10.10.0-beta.20329.1

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200629.2 (#12263)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20326-04 -> To Version 16.7.0-preview-20329-02

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200629.4 (#12266)

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-preview.7.20326.13 -> To Version 5.0.0-preview.7.20329.4

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200629.4 (#12268)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20329.1 -> To Version 10.10.0-beta.20329.4

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200629.5 (#12269)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20329.4 -> To Version 10.10.0-beta.20329.5

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200630.1 (#12273)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20329-02 -> To Version 16.7.0-preview-20330-01

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

* Add ILLink extension points (#12116) (#12264)

* Add ILLink extension points

See #12035

- PrepareForILLink target
- ManagedAssemblyToLink ItemGroup
- TrimMode property and metadata
- private _TrimmerCustomData (dotnet/linker#1134)
- Allow setting `PublishTrimmed` in a late import.targets

* Add tests for extension points

* Set Action in _RunILLink

* Add notes about ManagedAssemblyToLink

Co-authored-by: Sven Boemer <sbomer@gmail.com>

* Update dependencies from https://github.com/microsoft/msbuild build 20200630.2 (#12275)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20330-01 -> To Version 16.7.0-preview-20330-02

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

* Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6677 (#12284)

NuGet.Build.Tasks
 From Version 5.7.0-rtm.6670 -> To Version 5.7.0-rtm.6677

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200630.6 (#12286)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20330-02 -> To Version 16.7.0-preview-20330-06

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.2 (#12290)

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-preview.7.20329.4 -> To Version 5.0.0-preview.7.20330.2

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.5 (#12293)

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-preview.7.20330.2 -> To Version 5.0.0-preview.7.20330.5

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200630.7 (#12294)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20330-06 -> To Version 16.7.0-preview-20330-07

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.7 (#12299)

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-preview.7.20330.5 -> To Version 5.0.0-preview.7.20330.7

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200630.8 (#12300)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20330-07 -> To Version 16.7.0-preview-20330-08

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200630.10 (#12302)

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-preview.7.20330.7 -> To Version 5.0.0-preview.7.20330.10

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

* Updating the web deploy reference to 4.0.4

* Suppress NU1603 warning for Web Deploy package

* Updating the version to 4.0.5

* [release/5.0.1xx-preview7] Update dependencies from dotnet/aspnetcore (#12369)

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200706.7

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-preview.7.20330.10 -> To Version 5.0.0-preview.7.20356.7

* Update stage 0

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>

* Update dependencies from https://github.com/microsoft/msbuild build 20200706.3 (#12374)

Microsoft.Build.Localization , Microsoft.Build
 From Version 16.7.0-preview-20330-08 -> To Version 16.7.0-preview-20356-03

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

* Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6686 (#12378)

NuGet.Build.Tasks
 From Version 5.7.0-rtm.6677 -> To Version 5.7.0-rtm.6686

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200709.1 (#12390)

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

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200709.2 (#12410)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20329.5 -> To Version 10.10.0-beta.20359.2

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

* Update dependencies from https://github.com/microsoft/msbuild build 20200710.3 (#12415)

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

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200710.2 (#12417)

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-preview.7.20356.7 -> To Version 5.0.0-preview.7.20360.2

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

* Reverting #12084 (#12418)

* Update dependencies from https://github.com/NuGet/NuGet.Client build 5.7.0.6702 (#12428)

NuGet.Build.Tasks
 From Version 5.7.0-rtm.6686 -> To Version 5.7.0-rtm.6702

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

* Update dependencies from https://github.com/dotnet/fsharp build 20200711.3 (#12433)

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

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

* Update dependencies from https://github.com/dotnet/roslyn build 20200714.1 (#12453)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-3.20312.3 -> To Version 3.7.0-4.20364.1

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

* Update dependencies from https://github.com/dotnet/roslyn build 20200715.2 (#12469)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-4.20364.1 -> To Version 3.7.0-5.20365.2

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200715.7 (#12497)

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-preview.7.20360.2 -> To Version 5.0.0-preview.7.20365.7

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

* Update dependencies from https://github.com/dotnet/roslyn build 20200716.1 (#12505)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20366.1

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

* [release/5.0.1xx-preview7] Update dependencies from dotnet/runtime (#12493)

* Update dependencies from https://github.com/dotnet/runtime build 20200714.6

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

* Update dependencies from https://github.com/dotnet/runtime build 20200714.11

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

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200715.16 (#12509)

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-preview.7.20365.7 -> To Version 5.0.0-preview.7.20365.16

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

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200715.19 (#12511)

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-preview.7.20365.16 -> To Version 5.0.0-preview.7.20365.19

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

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200716.1 (#12512)

Microsoft.WindowsDesktop.App
 From Version 5.0.0-preview.7.20326.3 -> To Version 5.0.0-preview.7.20366.1

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 5.0.0-preview.7.20326.3 -> To Version 5.0.0-preview.7.20365.12 (parent: Microsoft.WindowsDesktop.App

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

* Update dependencies from https://github.com/dotnet/roslyn build 20200716.7 (#12523)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-5.20366.1 -> To Version 3.7.0-5.20366.7

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

* Update dependencies from https://github.com/dotnet/roslyn build 20200717.1 (#12531)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-5.20366.7 -> To Version 3.7.0-5.20367.1

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-qizh10 <58835984+v-qizh10@users.noreply.github.com>
Co-authored-by: Lukas Lansky <lulansky@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
Co-authored-by: Vijay Ramakrishnan <vramak@microsoft.com>
Co-authored-by: Vijay Ramakrishnan <vijayrkn@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
  • Loading branch information
12 people authored Jul 21, 2020
1 parent 3d3019a commit 083cb7f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ Copyright (c) .NET Foundation. All rights reserved.
ResourceName="CppRequiresTFMVersion31"
/>
</Target>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">
<_EnableDefaultWindowsPlatform Condition="'$(_EnableDefaultWindowsPlatform)' == ''" >false</_EnableDefaultWindowsPlatform>
<UseOSWinMdReferences>false</UseOSWinMdReferences>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' And '$(NETStandardMaximumVersion)' == ''">
<NETStandardMaximumVersion>2.1</NETStandardMaximumVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public void It_implicitly_defines_compilation_constants_for_the_target_framework
itemGroup.Add(supportedFramework);
});

AssertDefinedConstantsOutput(testAsset, targetFramework, new[] { "NETCOREAPP", "NET" }.Concat(expectedDefines).ToArray());
AssertDefinedConstantsOutput(testAsset, targetFramework, new[] { "NETCOREAPP", "NET", "WINDOWS", "WINDOWS7_0" }.Concat(expectedDefines).ToArray());
}

[Theory]
Expand Down Expand Up @@ -601,38 +601,6 @@ public void It_fails_gracefully_if_targetframework_should_be_targetframeworks(bo
$"The TargetFramework value '{targetFramework}' is not valid. To multi-target, use the 'TargetFrameworks' property instead");
}

[RequiresMSBuildVersionTheory("16.7.0-preview-20310-07")]
[InlineData("net5.0", false)]
[InlineData("netcoreapp3.1", true)]
public void It_defines_target_platform_defaults_correctly(string targetFramework, bool defaultsDefined)
{
TestProject testProject = new TestProject()
{
Name = "TargetPlatformDefaults",
IsSdkProject = true,
TargetFrameworks = targetFramework
};

var testAsset = _testAssetsManager.CreateTestProject(testProject);

var getValuesCommand = new GetValuesCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name), targetFramework, "TargetPlatformIdentifier");
getValuesCommand
.Execute()
.Should()
.Pass();

var values = getValuesCommand.GetValues();
if (defaultsDefined)
{
values.Count().Should().Be(1);
values.FirstOrDefault().Should().Be("Windows");
}
else
{
values.Count().Should().Be(0);
}
}

[Theory]
[InlineData("net5.0")]
[InlineData("netcoreapp3.1")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
[InlineData("net45", new[] { "NETFRAMEWORK=-1", "NET45=-1" }, true)]
[InlineData("net461", new[] { "NETFRAMEWORK=-1", "NET461=-1" }, true)]
[InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"" }, false)]
[InlineData("net5.0", new[] { "NET=-1", "NET5_0=-1", "NETCOREAPP=-1", "NETCOREAPP3_1=-1", "_MyType=\"Empty\"" }, false)]
[InlineData("net5.0", new[] { "NET=-1", "NET5_0=-1", "NETCOREAPP=-1", "NETCOREAPP3_1=-1", "WINDOWS=-1", "WINDOWS7_0=-1", "_MyType=\"Empty\"" }, false)]
[InlineData(".NETPortable,Version=v4.5,Profile=Profile78", new string[] { "_MyType=\"Empty\"" }, false)]
[InlineData(".NETFramework,Version=v4.0,Profile=Client", new string[] { "NETFRAMEWORK=-1", "NET40=-1" }, false)]
[InlineData("Xamarin.iOS,Version=v1.0", new string[] { "XAMARINIOS=-1", "XAMARINIOS1_0=-1", "_MyType=\"Empty\"" }, false)]
Expand Down

0 comments on commit 083cb7f

Please sign in to comment.