Commit graph

18919 commits

Author SHA1 Message Date
Daniel Plaisted
e270fa3f7a
Merge pull request #10902 from dsplaisted/merge-5.0.3xx-to-5.0.4xx
Merge 5.0.3xx to 5.0.4xx
2021-06-16 11:27:52 -07:00
Daniel Plaisted
aa378e8541 Merge release/5.0.3xx into release/5.0.4xx 2021-06-15 15:52:36 -07:00
Daniel Plaisted
ca29031b14
Merge pull request #10900 from dsplaisted/merge-5.0.2xx-to-5.0.3xx
Merge 5.0.2xx to 5.0.3xx
2021-06-15 13:45:27 -07:00
Daniel Plaisted
ebfaa67375 Merge release/5.0.2xx into release/5.0.3xx 2021-06-15 10:37:05 -07:00
Daniel Plaisted
293c06da86
Merge pull request #10885 from dsplaisted/win-sdk-fe-5.0.2xx
Update Windows targeting information
2021-06-15 07:43:51 -07:00
William Li
3bd0d468c0
Merge pull request #10898 from dotnet/wtgodbe/50321patch
Decrement 2.1 patch version
2021-06-14 15:32:51 -07:00
William Godbe
9ad65fcd08
Decrement 2.1 patch version (#10897) 2021-06-14 14:31:26 -07:00
William Godbe
aae22b05c4
Decrement 2.1 patch version
To account for 2.1 not building this month
2021-06-14 13:24:27 -07:00
dotnet-maestro[bot]
f580d5e9e9
Update dependencies from https://github.com/dotnet/sdk build 20210614.7 (#10894)
[release/5.0.4xx] Update dependencies from dotnet/sdk
2021-06-14 18:33:27 +00:00
dotnet-maestro[bot]
222595ecf2
Update dependencies from https://github.com/dotnet/sdk build 20210612.3 (#10890)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21310.17 to 3.11.0-2.21311.1 (parent: Microsoft.NET.Sdk)
2021-06-12 15:34:25 +00:00
Daniel Plaisted
39d41c1eb2 Revert to Windows SDK package versions that are currently published 2021-06-11 12:32:36 -07:00
Daniel Plaisted
ca77109054 Add Windows targeting information in new format, bump package versions, add 20348 as targetable version 2021-06-11 10:58:45 -07:00
dotnet-maestro[bot]
d273c6d195
Update dependencies from https://github.com/dotnet/sdk build 20210611.6 (#10884)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21302.15 to 3.11.0-2.21310.17 (parent: Microsoft.NET.Sdk)
2021-06-11 16:15:27 +00:00
dotnet-maestro[bot]
6352b64462
Update dependencies from https://github.com/dotnet/sdk build 20210610.17 (#10881)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21221.2 to 5.0.0-rtm.21310.1 (parent: Microsoft.NET.Sdk)
2021-06-10 22:36:57 +00:00
dotnet-maestro[bot]
5db6946a67
Update dependencies from https://github.com/dotnet/sdk build 20210610.10 (#10880)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.11.0-preview-21308-05 to 16.11.0-preview-21309-01 (parent: Microsoft.NET.Sdk)
2021-06-10 16:26:32 +00:00
dotnet-maestro[bot]
96b93222f7
Update dependencies from https://github.com/dotnet/sdk build 20210610.3 (#10879)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.11.0-preview-21305-01 to 16.11.0-preview-21308-05 (parent: Microsoft.NET.Sdk)
2021-06-10 11:00:15 +00:00
dotnet-maestro[bot]
c3e0fa6d7b
Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10872)
[release/5.0.3xx] Update dependencies from dotnet/arcade
2021-06-09 17:11:43 +00:00
dotnet-maestro[bot]
7f54d01025
Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10871)
[release/5.0.2xx] Update dependencies from dotnet/arcade
2021-06-09 17:02:16 +00:00
dotnet-maestro[bot]
a2e7db07aa
Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10870)
[release/5.0.4xx] Update dependencies from dotnet/arcade
2021-06-09 17:00:16 +00:00
William Godbe
09c87f0b54
Merge pull request #10866 from vseanreesermsft/internal-merge-5.0.3xx-2021-06-08-1100
Merging internal commits for release/5.0.3xx
2021-06-09 07:48:31 -07:00
William Godbe
4361d178c1
Merge pull request #10865 from vseanreesermsft/internal-merge-5.0.2xx-2021-06-08-1100
Merging internal commits for release/5.0.2xx
2021-06-08 15:59:24 -07:00
John Luo
605fba211f
Update aspnetcore 3.1 template versions (#10825) 2021-06-08 09:48:52 -07:00
John Luo
bc6ab3374b
Update aspnetcore 3.1 template versions (#10831) 2021-06-08 09:48:47 -07:00
John Luo
2e68bc17b7
Update aspnetcore 3.1 template versions (#10832) 2021-06-08 09:48:44 -07:00
dotnet-maestro[bot]
b4d07a717d
Update dependencies from https://github.com/dotnet/sdk build 20210605.3 (#10853)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.11.0-preview-21302-05 to 16.11.0-preview-21305-01 (parent: Microsoft.NET.Sdk)
2021-06-05 15:33:44 +00:00
dotnet-maestro[bot]
e547432132
Update dependencies from https://github.com/dotnet/sdk build 20210603.19 (#10843)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21301.11 to 3.11.0-2.21302.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.11.0-preview-21279-05 to 16.11.0-preview-21302-05 (parent: Microsoft.NET.Sdk)
2021-06-04 02:18:18 +00:00
dotnet-maestro[bot]
1e0e9da63d
[release/5.0.4xx] Update dependencies from dotnet/sdk (#10842)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.11.0-rc.8 to 5.11.0-rc.10 (parent: Microsoft.NET.Sdk)
2021-06-03 23:34:47 +00:00
dotnet-maestro[bot]
60bdd67a5f
Update dependencies from https://github.com/dotnet/sdk build 20210602.14 (#10838)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21278.9 to 3.11.0-2.21301.11 (parent: Microsoft.NET.Sdk)
2021-06-03 01:53:37 +00:00
dotnet-maestro[bot]
fbb6f434c1
[release/5.0.4xx] Update dependencies from dotnet/sdk (#10830)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21260.2 to 5.0.400-preview.21302.2 (parent: Microsoft.NET.Sdk)
2021-06-02 20:47:41 +00:00
Marc Paine
3fa24791a4
Merge pull request #10819 from dotnet/SDKScript-branding-302
Update branding for 5.0.3xx to 302
2021-06-01 12:46:24 -07:00
Marc Paine
d9ee90311e
Merge pull request #10820 from dotnet/SDKScript-branding-205
Update branding for 5.0.2xx to 205
2021-06-01 12:42:33 -07:00
Marc Paine
d2bf7aed72 Update branding for 5.0.2xx to 205 2021-06-01 11:23:12 -07:00
Marc Paine
c2e3e267d4 Update branding for 5.0.3xx to 302 2021-06-01 11:22:52 -07:00
dotnet-maestro[bot]
f6c28761a5
[release/5.0.4xx] Update dependencies from dotnet/sdk (#10812)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21276.3 to 3.11.0-2.21278.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.11.0-preview-21275-01 to 16.11.0-preview-21279-05 (parent: Microsoft.NET.Sdk)
2021-05-31 06:20:05 +00:00
dotnet-maestro[bot]
024913d52c
Update dependencies from https://github.com/dotnet/sdk build 20210527.15 (#10789)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 5.10.0-rc.7240 to 5.11.0-rc.8 (parent: Microsoft.NET.Sdk)
2021-05-27 20:47:38 +00:00
dotnet-maestro[bot]
e424b1822f
Update dependencies from https://github.com/dotnet/sdk build 20210527.9 (#10786)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21275.21 to 3.11.0-2.21276.3 (parent: Microsoft.NET.Sdk)
2021-05-27 17:36:41 +00:00
dotnet-maestro[bot]
978923c1fe
Update dependencies from https://github.com/dotnet/sdk build 20210526.7 (#10778)
[release/5.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-4.21262.12 to 3.11.0-2.21275.21 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0 to 16.11.0-preview-21275-01 (parent: Microsoft.NET.Sdk)
2021-05-26 20:56:09 +00:00
Sarah Oslund
ef17233f86 Merged PR 15167: Merge 5.0.2xx to 5.0.3xx internal 2021-05-21 19:48:38 +00:00
Sarah Oslund
f63f994967 Remove VSRedistCommonNetCoreTargetingPackx6450PackageVersion property 2021-05-21 11:20:38 -07:00
Sarah Oslund
f2c71cd32d Merge remote-tracking branch 'internal/release/5.0.2xx' into Internal502To503 2021-05-21 10:59:41 -07:00
DotNet Bot
6a6a1bae25 Merged PR 15136: [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App**: from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Internal**: from 5.0.6-servicing.21220.11 to 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.EntityFrameworkCore**: from 5.0.6 to 5.0.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - **dotnet-dev-certs**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.6-servicing.21221.3 to 5.0.7-servicing.21263.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.6-servicing.21221.8 to 5.0.6-servicing.21263.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.NET.Test.Sdk**: from 16.10.0-release-20210511-06 to 16.10.0-release-20210520-03 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 3.10.0-4.21262.12 to 3.10.0-4.21269.26 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 16.10.0 to 16.10.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:459d98e0-60cd-4202-65d2-08d91582604b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 459d98e0-60cd-4202-65d2-08d91582604b
- **Build**: 20210521.5
- **Date Produced**: 5/21/2021 11:30 AM
- **Commit**: 8e86aff63cbc2a14a24f321cef946cd435ef277d
- **Branch**: refs/heads/internal/release/5.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [fro...
2021-05-21 13:08:00 +00:00
DotNet-Bot
57dc629f24 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.7

Dependency coherency updates

Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 5.0.6-servicing.21221.6 -> To Version 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk
2021-05-21 12:30:20 +00:00
DotNet-Bot
4b800362b3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.5

Dependency coherency updates

Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 5.0.6-servicing.21220.11 -> To Version 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk
2021-05-21 11:40:45 +00:00
DotNet-Bot
a33e46e202 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210520.41
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21270.41

Dependency coherency updates

VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 5.0.6-servicing.21223.5 -> To Version 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk
2021-05-21 06:37:54 +00:00
Marc Paine
5b31fca7e8
Update Versions.props 2021-05-20 11:21:19 -07:00
Sarah Oslund
4cc6486d65
Merge pull request #10703 from dotnet/marcpopMSFT-portincludesfix
We were incorrectly includes .net core files and targets in the VS sw…
2021-05-20 10:33:47 -07:00
Marc Paine
59a0c40a45
Merge pull request #10681 from j0shuams/patch-1
Update Windows SDK Projection
2021-05-20 10:21:10 -07:00
Marc Paine
cc33950395 We were incorrectly includes .net core files and targets in the VS swr file. 2021-05-20 09:57:55 -07:00
Sarah Oslund
6ae7526b22
Merge pull request #10669 from dotnet/SDKScript-branding-301
Update branding for 5.0.3xx 5.0.3xx
2021-05-20 09:52:31 -07:00
William Li
56797e67ed Update implicit versions
Disable and fix tests do not work with non-existent
LastRuntimeFrameworkVersion
2021-05-20 09:22:45 -07:00