Commit graph

18752 commits

Author SHA1 Message Date
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]
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
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
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
DotNet Bot
84d1fe1bb7 Merged PR 14981: [internal/release/5.0.2xx] 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)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a
- **Build**: 20210513.30
- **Date Produced**: 5/14/2021 2:39 AM
- **Commit**: b4ddf0facd49caab999e4accd6cb82d5e599bf5e
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1]
  - **Microsoft.NET.Sdk**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1]
  - **Microsoft.WindowsDesktop.App**: [from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4][2]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.6-servicing....
2021-05-14 03:05:16 +00:00
dotnet-bot
14ab1cc86f Merge in 'release/5.0.2xx' changes 2021-05-14 00:57:17 +00:00
Marc Paine
95c6dcf69b
Merge pull request #10623 from manodasanW/patch-1
Update Windows SDK projection
2021-05-13 17:54:01 -07:00
Manodasan Wignarajah
29a0b6e229
Update Windows SDK projection 2021-05-13 15:52:42 -07:00
dotnet-bot
cb36e2610d Merge in 'release/5.0.2xx' changes 2021-05-13 21:15:32 +00:00
Marc Paine
230b666efe
Merge pull request #10613 from dotnet/marcpopMSFT-downloadimplicitversion502
Update GenerateBundledVersions.targets
2021-05-13 14:14:20 -07:00
Matt Mitchell
284a83fcf5 Merge branch 'release/5.0.2xx' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into internal/release/5.0.2xx 2021-05-13 10:42:37 -07:00
Matt Mitchell
e0232bce5b
Remove unneeded things from nuget.config (#10610) 2021-05-13 10:33:31 -07:00
Marc Paine
2d88de2b5a
Update GenerateBundledVersions.targets 2021-05-13 10:24:49 -07:00
Matt Mitchell
8d98875ae2 Merge remote-tracking branch 'upstream/release/5.0.2xx' into internal/release/5.0.2xx 2021-05-13 09:37:55 -07:00
DotNet Bot
f9399e79ad [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.204 (parent: Microsoft.NET.Sdk)
2021-05-12 03:19:24 +00:00
Marc Paine
8f6eaacc1b
Merge pull request #10585 from dotnet/SDKScript-internalmerge-204
Update merge for 5.0.2xx 5.0.2xx
2021-05-11 17:52:18 -07:00
Marc Paine
ccbf9e46d9
Update NuGet.config 2021-05-11 13:27:54 -07:00
Marc Paine
d0a8c6b661 Remove internal feed 2021-05-11 13:23:03 -07:00
William Godbe
db6d94e067
Update aspnet 2.1/3.1 template version (#10484) 2021-05-11 11:40:33 -07:00
DotNet Bot
0c1b8bc1d7 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-05-04 23:44:05 +00:00
Marc Paine
d0b9fd62e5
Merge pull request #10502 from dotnet/marcpopMSFT-SDL
Update sdl-tsa-vars.config
2021-05-04 15:58:18 -07:00
Marc Paine
6022619eaa
Update sdl-tsa-vars.config 2021-05-04 14:47:35 -07:00
Marc Paine
db7e072191
Merge pull request #10495 from dotnet/SDKScript-branding-204
Update branding for 5.0.2xx 5.0.2xx
2021-05-04 14:44:29 -07:00
Marc Paine
4b27177823 Update branding for 5.0.2xx 5.0.2xx 2021-05-04 11:46:30 -07:00
DotNet Bot
383637d63f Merged PR 14475: [internal/release/5.0.2xx] 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**:
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.EntityFrameworkCore**: from 5.0.5 to 5.0.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - **dotnet-dev-certs**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a
- **Build**: 20210423.17
- **Date Produced**: 4/23/2021 9:02 PM
- **Commit**: 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1]
  - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 5.0.6 to 5.0.6][2]
  - **Microsoft.EntityFrameworkCore**: [from 5.0.5 to 5.0.6][3]
  - **dotnet-dev-certs**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2]
  - **dotnet-user-secrets**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb802590&targetVersion=GC7cebab8&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCf3eeec8&targetVersion=GCdc5e11a&_a=files
[3]: 5420351...42e8143

[DependencyUpdate]: <> (End)

[marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a)
2021-04-23 22:29:51 +00:00
DotNet Bot
b5f47e6c6a Merged PR 14458: [internal/release/5.0.2xx] 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.ILLink.Tasks**: from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a
- **Build**: 20210422.11
- **Date Produced**: 4/22/2021 5:53 PM
- **Commit**: b8025906f7463b6e477893c81238dc7003b353a3
- **Branch**: refs/heads/internal/release/5.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21221.21 to 5.0.203-servicing.21222.11][1]
  - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21221.21 to 5.0.203-servicing.21222.11][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC61764b9&targetVersion=GCb802590&_a=files
[2]: 311102e...6a15056

[DependencyUpdate]: <> (End)

[marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a)
2021-04-22 18:10:07 +00:00
DotNet Bot
16145475d8 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.6-servicing.21213.7 to 5.0.6-servicing.21221.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.6-servicing.21213.9 to 5.0.6-servicing.21221.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.6-servicing.21213.16 to 5.0.6-servicing.21221.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-04-21 22:36:48 +00:00
DotNet Bot
db8ff75c70 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk)
2021-04-21 17:41:26 +00:00
DotNet Bot
60d5db0540 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Internal: from 5.0.6-servicing.21209.7 to 5.0.6-servicing.21220.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
2021-04-21 15:40:47 +00:00
DotNet Bot
ff5e718c8b [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk)
2021-04-16 14:21:30 +00:00
DotNet Bot
9e78852ef8 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Internal: from 5.0.5-servicing.21166.9 to 5.0.6-servicing.21209.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.203 (parent: Microsoft.NET.Sdk)
2021-04-16 12:55:15 +00:00
Marc Paine
d2317e1ab6
Merge pull request #10215 from j0shuams/patch-2
Update Windows SDK Projection
2021-04-14 10:26:06 -07:00
Marc Paine
89766248ff
Merge pull request #10209 from dotnet/SDKScript-branding-203
Update branding for 5.0.2xx 5.0.2xx
2021-04-14 09:08:40 -07:00
DotNet Bot
31d21a2746 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21213.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.5-servicing.21167.1 to 5.0.6-servicing.21213.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21213.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-04-14 12:06:18 +00:00
DotNet Bot
79cc44c283 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21161.4 to 5.0.0-rtm.21213.1 (parent: Microsoft.NET.Sdk)
2021-04-14 11:07:56 +00:00
DotNet Bot
8d820acefd [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-04-14 01:49:07 +00:00
Joshua Larkin
ee8601ef06
Update Windows SDK Projection 2021-04-13 16:00:33 -07:00
DotNet Bot
cb7f067d43 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-04-13 21:25:31 +00:00
Marc Paine
ca9be29c87 Remove internal feed 2021-04-13 11:34:06 -07:00
Marc Paine
cfbc2763af Merge commit 'db7cc87d512335808e3806067f2bf9b31379e1db' into SDKScript-branding-203 2021-04-13 11:34:05 -07:00
dotnet-bot
2ed1d9e5d7 Merge in 'release/5.0.2xx' changes 2021-04-13 18:16:11 +00:00
dotnet-maestro[bot]
fd2fca7ba5
Update dependencies from https://github.com/dotnet/arcade build 20210310.3 (#10201)
[release/5.0.2xx] Update dependencies from dotnet/arcade
2021-04-13 18:13:34 +00:00
dotnet-bot
a4bcc760d4 Merge in 'release/5.0.2xx' changes 2021-04-13 18:09:59 +00:00
John Luo
7751fb2996
Update aspnetcore 2.1 & 3.1 template versions (#10169) 2021-04-13 11:08:13 -07:00
DotNet Bot
b335e6569a [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-04-12 23:32:45 +00:00
DotNet Bot
32fb096a9d [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.202 to 5.0.203 (parent: Microsoft.NET.Sdk)
2021-04-12 12:20:08 +00:00
DotNet Bot
78ad023e02 [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-04-09 04:22:45 +00:00