Commit graph

18955 commits

Author SHA1 Message Date
Marc Paine
95c6dcf69b
Merge pull request #10623 from manodasanW/patch-1
Update Windows SDK projection
2021-05-13 17:54:01 -07:00
dotnet-maestro[bot]
b2a1408578
Update dependencies from https://github.com/dotnet/sdk build 20210513.23 (#10624)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21261-10 to 16.10.0 (parent: Microsoft.NET.Sdk)
2021-05-14 00:00:47 +00: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
dotnet-maestro[bot]
2c9a74538e
Update dependencies from https://github.com/dotnet/sdk build 20210513.15 (#10617)
[release/5.0.3xx] Update dependencies from dotnet/sdk
2021-05-13 20:19:59 +00: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-maestro[bot]
96554f5d32
Update dependencies from https://github.com/dotnet/sdk build 20210513.7 (#10607)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21253.4 to 11.4.2-beta.21262.7 (parent: Microsoft.NET.Sdk)
2021-05-13 16:10:30 +00:00
Sarah Oslund
763ac54961
Merge pull request #10595 from sfoslund/ImplicitVersions
[5.0.3xx] Update implicit versions
2021-05-13 08:30:42 -07:00
dotnet-maestro[bot]
63b95ebdee
Update dependencies from https://github.com/dotnet/sdk build 20210512.17 (#10596)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21221.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.5-servicing.21166.9 to 5.0.6-servicing.21220.11 (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.21223.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.5 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.5-servicing.21167.8 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21223.5 (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.21221.3 (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.21221.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-05-13 00:41:43 +00:00
Sarah Oslund
a93abbb3e9 Keep aspnet targeting pack version 3.1.10 2021-05-12 15:11:40 -07:00
Sarah Oslund
0f2fd7baa7 Bump implicit version to 2.1.28 2021-05-12 14:53:43 -07:00
Sarah Oslund
04e9b5bab6 Update branding for servicing 2021-05-12 12:59:57 -07:00
Sarah Oslund
0c03d8cce0 Update implicit versions 2021-05-12 12:54:12 -07:00
Marc Paine
faff70f02e Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. 2021-05-12 12:49:00 -07:00
dotnet-maestro[bot]
1a09151ece
Update dependencies from https://github.com/dotnet/sdk build 20210512.7 (#10591)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21260-01 to 16.10.0-preview-21261-10 (parent: Microsoft.NET.Sdk)
2021-05-12 15:47:55 +00:00
dotnet-maestro[bot]
21c377d969
Update dependencies from https://github.com/dotnet/sdk build 20210511.23 (#10588)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210511-04 to 16.10.0-release-20210511-06 (parent: Microsoft.NET.Sdk)
2021-05-12 05:49:22 +00: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
dotnet-maestro[bot]
4ff2792e8a
Update dependencies from https://github.com/dotnet/sdk build 20210511.20 (#10587)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210507-01 to 16.10.0-release-20210511-04 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21258.12 to 4.0.0-2.21260.14 (parent: Microsoft.NET.Sdk)
2021-05-12 02:26:55 +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
William Godbe
2b29192882
Update aspnet 2.1/3.1 template version (#10486) 2021-05-11 11:30:55 -07:00
dotnet-maestro[bot]
ced9b4dd39
Update dependencies from https://github.com/dotnet/sdk build 20210511.5 (#10580)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21257-01 to 16.10.0-preview-21260-01 (parent: Microsoft.NET.Sdk)
2021-05-11 16:28:52 +00:00
dotnet-maestro[bot]
fc11ed41d0
Update dependencies from https://github.com/dotnet/sdk build 20210510.6 (#10575)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21257.1 to 5.0.300-preview.21260.2 (parent: Microsoft.NET.Sdk)
2021-05-11 02:01:43 +00:00
dotnet-maestro[bot]
e659912dfb
Update dependencies from https://github.com/dotnet/sdk build 20210508.4 (#10565)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21256.25 to 4.0.0-2.21258.12 (parent: Microsoft.NET.Sdk)
2021-05-08 16:40:39 +00:00
dotnet-maestro[bot]
42789e1aeb
Update dependencies from https://github.com/dotnet/sdk build 20210508.3 (#10564)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21256-02 to 16.10.0-preview-21257-01 (parent: Microsoft.NET.Sdk)
2021-05-08 16:00:02 +00:00
dotnet-maestro[bot]
b216e38d2c
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10556)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21256.2 to 5.0.300-preview.21257.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210505-01 to 16.10.0-release-20210507-01 (parent: Microsoft.NET.Sdk)
2021-05-07 22:48:44 +00:00
Marc Paine
15d71dedf2
Merge pull request #10542 from dotnet/darc-release/5.0.3xx-cb6c4acd-ee8e-45f6-b622-6c09429a1c06
[release/5.0.3xx] Update dependencies from dotnet/sdk
2021-05-07 10:11:10 -07:00
dotnet-maestro[bot]
add921b50c Update dependencies from https://github.com/dotnet/sdk build 20210507.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.300-preview.21256.10 -> To Version 5.0.300-preview.21257.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.0.0-2.21254.26 -> To Version 4.0.0-2.21256.25 (parent: Microsoft.NET.Sdk
2021-05-07 15:52:03 +00:00
dotnet-maestro[bot]
530a266b3c Update dependencies from https://github.com/dotnet/sdk build 20210506.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 5.0.300-preview.21256.10 -> To Version 5.0.300-preview.21256.16

Dependency coherency updates

Microsoft.Build
 From Version 16.11.0-preview-21254-21 -> To Version 16.10.0-preview-21256-02 (parent: Microsoft.NET.Sdk
2021-05-06 23:55:24 +00:00
dotnet-maestro[bot]
9dc2d3818f
Update dependencies from https://github.com/dotnet/sdk build 20210506.10 (#10535)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21230.1 to 5.0.300-preview.21256.2 (parent: Microsoft.NET.Sdk)
2021-05-06 19:12:19 +00:00
dotnet-maestro[bot]
94f1383b85
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10518)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210504-02 to 16.10.0-release-20210505-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21254.8 to 4.0.0-2.21254.26 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21253-02 to 16.11.0-preview-21254-21 (parent: Microsoft.NET.Sdk)
2021-05-05 23:10:27 +00:00
dotnet-maestro[bot]
5c63576235
Update dependencies from https://github.com/dotnet/sdk build 20210505.2 (#10513)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21214.2 to 5.0.300-preview.21230.1 (parent: Microsoft.NET.Sdk)
2021-05-05 11:27:12 +00: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
dotnet-maestro[bot]
6a4d140165
Update dependencies from https://github.com/dotnet/sdk build 20210504.12 (#10501)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210429-01 to 16.10.0-release-20210504-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.10.0-preview.3.7228 to 5.10.0-rc.7240 (parent: Microsoft.NET.Sdk)
2021-05-04 21:32:07 +00:00
dotnet-maestro[bot]
5729ae8f7f
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10478)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21230.7 to 11.4.2-beta.21253.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21229.16 to 4.0.0-2.21254.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21228-02 to 16.10.0-preview-21253-02 (parent: Microsoft.NET.Sdk)
2021-05-04 20:25:19 +00:00
Marc Paine
4b27177823 Update branding for 5.0.2xx 5.0.2xx 2021-05-04 11:46:30 -07:00
dotnet-maestro[bot]
bf3fac5cb1
Update dependencies from https://github.com/dotnet/sdk build 20210503.8 (#10464)
[release/5.0.3xx] Update dependencies from dotnet/sdk
2021-05-03 18:28:32 +00:00
dotnet-maestro[bot]
050a3e76ca
[release/5.0.3xx] Update dependencies from dotnet/sdk (#10432)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21227.5 to 11.4.2-beta.21230.7 (parent: Microsoft.NET.Sdk)
2021-05-01 16:18:01 +00:00
dotnet-maestro[bot]
a350448d69
Update dependencies from https://github.com/dotnet/sdk build 20210429.26 (#10425)
[release/5.0.3xx] Update dependencies from dotnet/sdk
2021-04-30 04:03:45 +00:00
dotnet-maestro[bot]
db001f3ce9
Update dependencies from https://github.com/dotnet/sdk build 20210429.19 (#10420)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210427-02 to 16.10.0-release-20210429-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21227.22 to 4.0.0-2.21229.16 (parent: Microsoft.NET.Sdk)
2021-04-30 00:20:11 +00:00
dotnet-maestro[bot]
5d7729e970
Update dependencies from https://github.com/dotnet/sdk build 20210429.8 (#10412)
[release/5.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 16.10.0-preview-21228-01 to 16.10.0-preview-21228-02 (parent: Microsoft.NET.Sdk)
2021-04-29 20:53:18 +00:00