Commit graph

18915 commits

Author SHA1 Message Date
DotNet Bot
fb975f1b56 [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.8-servicing.21314.6 to 5.0.8-servicing.21315.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.7-servicing.21263.9 to 5.0.8-servicing.21315.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.7 to 5.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.EntityFrameworkCore: from 5.0.7 to 5.0.8 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - dotnet-dev-certs: from 5.0.7-servicing.21263.9 to 5.0.8-servicing.21315.3 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.7-servicing.21263.9 to 5.0.8-servicing.21315.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.8-servicing.21314.2 to 5.0.8-servicing.21314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.8-servicing.21314.6 to 5.0.8-servicing.21314.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-06-15 21:24:23 +00:00
dotnet-bot
303760f056 Merge in 'release/5.0.3xx' changes 2021-06-15 20:46:36 +00: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
Ryland Alaniz
d904dab19d Merged PR 15831: WindowsDesktop NET5 ARM64: Include WindowsDesktop ARM64 in the Installer (internal)
This is a cherry-pick of https://github.com/dotnet/installer/pull/10699 (which targets the public Installer repo, branch release/5.0.3xx) to the internal Installer repo, branch internal/release/5.0.3xx.

The public PR has been approved for 5.0.8 servicing.
2021-06-15 17:53:29 +00: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
dotnet-bot
91417114f6 Merge in 'release/5.0.3xx' changes 2021-06-14 22:34:31 +00: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
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 Bot
3d22936c73 [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-4.21273.6 to 3.10.0-4.21310.5 (parent: Microsoft.NET.Sdk)
2021-06-11 16:55:11 +00:00
DotNet Bot
5771f4b00c [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21308.2 to 11.4.2-beta.21310.3 (parent: Microsoft.NET.Sdk)
2021-06-11 16:03:57 +00:00
DotNet Bot
2a10d4cfcd [internal/release/5.0.3xx] Update dependencies from dnceng/internal/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-11 05:23:58 +00:00
DotNet Bot
93148e7ddc [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21262.7 to 11.4.2-beta.21308.2 (parent: Microsoft.NET.Sdk)
2021-06-10 11:36:24 +00:00
DotNet Bot
a6076b1a3e [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.301-servicing.21277.3 to 5.0.301-servicing.21309.4 (parent: Microsoft.NET.Sdk)
2021-06-09 22:08:59 +00:00
dotnet-bot
8954272228 Merge in 'release/5.0.3xx' changes 2021-06-09 17:13:18 +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 Bot
caf8cf2896 [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21260.2 to 5.0.301-servicing.21277.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.1 to 16.10.2 (parent: Microsoft.NET.Sdk)
2021-06-09 16:26:24 +00:00
dotnet-bot
0bcc014108 Merge in 'release/5.0.3xx' changes 2021-06-09 14:49:57 +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
dotnet-bot
1a47e5b64a Merge in 'release/5.0.3xx' changes 2021-06-08 16:51:09 +00: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
dotnet-bot
f309946ce3 Merge in 'release/5.0.3xx' changes 2021-06-01 19:48:03 +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 Bot
cc8c0abb32 Merged PR 15248: [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.NET.Test.Sdk**: from 16.10.0-release-20210520-03 to 16.10.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 3.10.0-4.21269.26 to 3.10.0-4.21273.6 (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**: 20210525.20
- **Date Produced**: 5/26/2021 3:45 AM
- **Commit**: 2301780038372b9dd2357e9ffeda06942f62e296
- **Branch**: refs/heads/internal/release/5.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.301-servicing.21271.7 to 5.0.301-servicing.21275.20][1]
  - **Microsoft.NET.Sdk**: [from 5.0.301-servicing.21271.7 to 5.0.301-servicing.21275.20][1]
  - **Microsoft.NET.Test.Sdk**: [from 16.10.0-release-20210520-03 to 16.10.0][2]
  - **Microsoft.Net.Compilers.Toolset**: [from 3.10.0-4.21269.26 to 3.10.0-4.21273.6][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1555c5a&targetVersion=GC2301780&_a=files
[2]: 5c9abb2...5c9abb2
[3]: 0298477...a408003

[DependencyUpdate]: <> (End)

[marker]: <> (End:459d98e0-60cd-4202-65d2-08d91582604b)
2021-05-26 04:06:33 +00:00
DotNet-Bot
7a767ab03a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210525.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.301-servicing.21271.7 -> To Version 5.0.301-servicing.21275.20

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 16.10.0-release-20210520-03 -> To Version 16.10.0 (parent: Microsoft.NET.Sdk
2021-05-26 04:01:38 +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
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
dotnet-maestro[bot]
7726e44f45
Update dependencies from https://github.com/dotnet/sdk build 20210519.13 (#10683)
[release/5.0.3xx] Update dependencies from dotnet/sdk
2021-05-19 21:24:31 +00:00
Marc Paine
7f2f577a62 Downgrade implicit version because of no planned release for 2.1 in June. 2021-05-19 12:08:33 -07:00
Joshua Larkin
3b00eac7d0
Update Windows SDK Projection 2021-05-19 11:55:24 -07:00
v-wuzhai
94ee71890e
Merge pull request #10666 from dotnet/darc-release/5.0.3xx-52a56667-d06d-49d2-b1ed-d430ec79746a
[release/5.0.3xx] Update dependencies from dotnet/test-templates
2021-05-19 12:32:38 +08:00