Skip to content

Merge master release/5.0.1xx preview8 #12649

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
wants to merge 44 commits into from
Closed

Merge master release/5.0.1xx preview8 #12649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
f33c9db
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jul 16, 2020
df71ee0
Enable builds of internal branches (#12517)
mmitche Jul 16, 2020
3cb3695
[release/5.0.1xx-preview8] Update dependencies from microsoft/msbuild…
dotnet-maestro[bot] Jul 17, 2020
e36cc98
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 18, 2020
aac822b
Only include the LaunchSettings & ServiceDependencies in None if present
vijayrkn Jul 17, 2020
2a3755a
Merge pull request #12533 from dotnet/vramak/FixSDGlobIssue
vijayrkn Jul 20, 2020
37c8a74
Update dependencies from https://github.com/dotnet/roslyn build 20200…
dotnet-maestro[bot] Jul 21, 2020
dab2534
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 21, 2020
b4ac34c
[release/5.0.1xx-preview8] Update dependencies from microsoft/msbuild…
dotnet-maestro[bot] Jul 21, 2020
3d3019a
Update dependencies from https://github.com/NuGet/NuGet.Client build …
dotnet-maestro[bot] Jul 21, 2020
083cb7f
Merge preview 7 to preview 8 (#12577)
sfoslund Jul 21, 2020
2827b99
Internal feeds for Preview 8 (#12556)
lukas-lansky Jul 21, 2020
fb9d532
[release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp (#1…
dotnet-maestro[bot] Jul 22, 2020
a920d61
[release/5.0.1xx-preview8] Update dependencies from dotnet/roslyn (#1…
dotnet-maestro[bot] Jul 22, 2020
a6ecb3e
[release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp (#1…
dotnet-maestro[bot] Jul 22, 2020
28d7993
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 23, 2020
d9ae880
Update dependencies from https://github.com/dotnet/roslyn build 20200…
dotnet-maestro[bot] Jul 23, 2020
285cac3
Show a message when building as part of dotnet-run (#12581)
pranavkm Jul 23, 2020
c7e7130
Parse target platform properties from target framework
sfoslund Jun 25, 2020
c245d35
Replacing old logic for parsing target framework properties
sfoslund Jun 26, 2020
1c295c7
PR feedback
sfoslund Jun 30, 2020
50b8fad
Error on unsupported target platform identifier
sfoslund Jul 1, 2020
113031d
Update VS version to 16.8
sfoslund Jul 20, 2020
cbedf95
Temporarily disabling full framework c++ tests
sfoslund Jul 20, 2020
41bcf94
Fix merge issues
sfoslund Jul 23, 2020
c0f65b1
Error on unsupported Windows TargetPlatformVersion
sfoslund Jul 17, 2020
108416d
PR feedback
sfoslund Jul 21, 2020
fcad556
Add WindowsOnlyRequiresMSBuildVersion fact and theory test attributes
sfoslund Jul 8, 2020
ac85508
Fix merge issues
sfoslund Jul 23, 2020
ce24326
PR feedback
sfoslund Jul 23, 2020
f19d2d2
Clean up from merge
sfoslund Jul 17, 2020
f283269
Clean up from merge
sfoslund Jul 17, 2020
fc32d1d
Merge pull request #12612 from sfoslund/ParseTPPrev8
sfoslund Jul 23, 2020
b204893
Only set Windows as target platform when UseWPF or UseWindowsForms
sfoslund Jul 23, 2020
a7e31f9
Merge remote-tracking branch 'upstream/release/5.0.1xx-preview8' into…
sfoslund Jul 23, 2020
66133d2
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 23, 2020
6ffaf21
Merge pull request #12613 from sfoslund/UnsupportedTPVPrev8
sfoslund Jul 24, 2020
52dc3f1
Update dependencies from https://github.com/dotnet/roslyn build 20200…
dotnet-maestro[bot] Jul 24, 2020
2842612
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 24, 2020
f9e30fa
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 25, 2020
1133bf0
Update dependencies from https://github.com/dotnet/fsharp build 20200…
dotnet-maestro[bot] Jul 25, 2020
47ad81e
Merge branch 'master' into merge-master-release/5.0.1xx-preview8-072620
Jul 27, 2020
aa52f3a
Merge format
Jul 27, 2020
033483d
String merge conflict
Jul 27, 2020
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
49 changes: 35 additions & 14 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,41 @@ stages:
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: buildpool.windows.10.amd64.vs2017
Copy link
Member

@sfoslund sfoslund Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the changes in this file?

Copy link
Author

@wli3 wli3 Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. This is not something arcade can automatically handle

queue: BuildPool.Windows.10.Amd64.VS2019.Pre
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open
strategy:
matrix:
${{ if eq(variables['System.TeamProject'], 'public') }}:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
Build_Debug:
_BuildConfig: Debug
_PublishType: none
_SignType: test
_Test: -test
Build_Release:
_BuildConfig: Release
${{ if eq(variables['System.TeamProject'], 'public') }}:
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
_PublishType: none
_SignType: test
_Test: -test
${{ if ne(variables['System.TeamProject'], 'public') }}:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
_PublishType: blob
_SignType: real
_Test: ''
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/build.yml
parameters:
agentOs: Windows_NT_FullFramework
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT
strategy:
matrix:
Build_Debug:
Expand All @@ -88,8 +95,12 @@ stages:
parameters:
agentOs: Windows_NT_TestAsTools
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
strategy:
matrix:
Build_Debug:
Expand All @@ -101,9 +112,16 @@ stages:
parameters:
agentOs: Ubuntu_16_04
pool:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1604.Amd64.Open
helixTargetQueue: Ubuntu.1604.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1604.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCoreInternal-Pool
queue: BuildPool.Ubuntu.1604.Amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1604.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1604.Amd64
strategy:
matrix:
Build_Debug:
Expand All @@ -120,7 +138,10 @@ stages:
agentOs: Darwin
pool:
name: Hosted macOS
helixTargetQueue: OSX.1014.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: OSX.1014.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: OSX.1014.Amd64
strategy:
matrix:
Build_Debug:
Expand Down
148 changes: 148 additions & 0 deletions eng/Version.Details.xml.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="5.0.0-rc.1.20371.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>d3fea50b8720f9a581826da79a7559975982fc19</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20364.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1">
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20371-01">
<Uri>https://github.com/microsoft/msbuild</Uri>
<Sha>e8338f5ad91d42c3196218648859e9e837099842</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="16.8.0-preview-20371-01">
<Uri>https://github.com/microsoft/msbuild</Uri>
<Sha>e8338f5ad91d42c3196218648859e9e837099842</Sha>
</Dependency>
<<<<<<< HEAD
Copy link
Member

@sfoslund sfoslund Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge issues

<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20375.2">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>9abe1ba94b260429e5d055f1cc1b9e2a83fddf30</Sha>
=======
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20373.2">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>494e1dca147f0454b4627bfce625148e7815d81e</Sha>
>>>>>>> master
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-1.20373.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>fc5f6179a2521062cb61d44d0e41e1ef596907d9</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
<<<<<<< HEAD
=======
<Dependency Name="Microsoft.NET.Sdk.BlazorWebAssembly" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
>>>>>>> master
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-preview.1.6718">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>d428c2a79aae81ade1caa326e04f65a119025f42</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.7.0-release-20200612-02">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>df62aca07cacc5c018dc8e828f03a0cd79ee52da</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20374.1">
<Uri>https://github.com/mono/linker</Uri>
<Sha>8224c7254fc4aa5da70bb7d2e0d1c55bca1e19bf</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-rc.1.20371.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d8cf13e0ba9b369a15a83472b6b97463c6d07fe2</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.1.20372.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>e0c53c38b065bb6b88e280adc142060c53356795</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="5.0.0-rc.1.20372.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>917538415b23b55ae220bd993a5951c7cfb27d08</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="5.0.0-rc.1.20374.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3a819929a7fb969ac260d55c003944d1d9dbac27</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="3.1.0" Pinned="true">
<Uri>https://github.com/aspnet/xdt</Uri>
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="3.3.0-beta3.20373.3">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>59425baad150d854245a8498140caf115d4807d9</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20364.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20364.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20364.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading