Commit graph

14782 commits

Author SHA1 Message Date
William Li
d120cc9242 Also revert VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 2019-12-11 12:06:13 -08:00
Matt Mitchell
e801d8de1b Revert back to 3.1.0 runtime versions 2019-12-10 17:53:24 -08:00
Matt Mitchell
9060c20d14
Merge pull request #5830 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2019-12-10 08:32:37 -08:00
dotnet-maestro[bot]
00b314d83b
Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#5848)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3
2019-12-08 01:18:36 +00:00
dotnet-maestro[bot]
16041a08d3
Update dependencies from https://github.com/dotnet/arcade build 20191207.3 (#5846)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3
2019-12-08 01:17:21 +00:00
Matt Mitchell
1434995df1
Remove incorrect stage dependencies (#5793) (#5842)
Remove dependencies on stages that do not exist. Keep stages that are necessary for servicing branches
2019-12-07 07:43:56 -08:00
William Li
f25735cdef
Merge pull request #5843 from mmitche/stage-update-312
[release/3.1.2xx] Remove incorrect stage dependencies (#5793)
2019-12-06 17:06:47 -08:00
Matt Mitchell
c996293459 Remove incorrect stage dependencies (#5793)
Remove dependencies on stages that do not exist. Keep stages that are necessary for servicing branches
2019-12-06 16:02:31 -08:00
dotnet-maestro[bot]
b151544260
Update dependencies from https://github.com/dotnet/toolset build 20191206.5 (#5839)
- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.19606.5

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.1.0 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview1.19602.2 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-12-06 23:29:32 +00:00
William Godbe
a3c1db033e
Pin dependency on Core-Setup ref packs to 3.1.0 (#5814)
* Pin dependency on Core-Setup ref packs to 3.1.0

* Fixup core-setup feeds

* Move pinned deps later in file

* Update GenerateLayout to account for pinned packs
2019-12-06 14:56:33 -08:00
William Li
bdaa8772d7
Merge pull request #5827 from dotnet/wli3-patch-1
Update branding to "preview"
2019-12-06 10:06:04 -08:00
Matt Mitchell
a7599e4f05
Update to 3.1.100 rtm sdk (#5829) 2019-12-05 15:18:42 -08:00
dotnet-maestro[bot]
0e2f5458a0
Update dependencies from https://github.com/dotnet/arcade build 20191205.2 (#5835)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2
2019-12-05 23:04:22 +00:00
dotnet-maestro[bot]
0c0a037663
Update dependencies from https://github.com/dotnet/arcade build 20191205.2 (#5833)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2
2019-12-05 23:01:19 +00:00
dotnet-maestro[bot]
51e15d2e9b
Update dependencies from https://github.com/dotnet/test-templates build 20191120.1 (#5832)
- Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.19570.1
2019-12-05 22:55:13 +00:00
Matt Mitchell
2b01f1ce01
Update to 3.1.100 rtm sdk (#5828) 2019-12-05 13:49:07 -08:00
dotnet-maestro[bot]
25e6874795
Update dependencies from https://github.com/dotnet/test-templates build 20191120.1 (#5816)
- Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.19570.1
2019-12-05 19:48:26 +00:00
dotnet-maestro[bot]
cef20df33a
[release/3.1.1xx] Update dependencies from dotnet/core-setup (#5794)
* Update dependencies from https://github.com/dotnet/core-setup build 20191126.7

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.7
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.7
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.7
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.7
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.7
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.7
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.7

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19576.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/core-setup build 20191126.9

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.9
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.9
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.9
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.9
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.9
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.9
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.9

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.19576.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19576.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2019-12-05 19:44:37 +00:00
dotnet-maestro[bot]
326f8a5f48
Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#5823)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16
2019-12-05 19:40:39 +00:00
dotnet-maestro[bot]
d28a00f0ba
Update dependencies from https://github.com/aspnet/AspNetCore build 20191125.14 (#5786)
- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19575.14
- dotnet-user-secrets - 3.1.0-rtm.19575.14
- dotnet-watch - 3.1.0-rtm.19575.14
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19575.14
2019-12-05 19:32:56 +00:00
William Li
5b489d6169
Update branching to "preview" 2019-12-05 11:14:53 -08:00
William Li
731d27c264
Merge pull request #5768 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2019-12-05 10:54:40 -08:00
dotnet-maestro[bot]
7f1f56e98c
Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#5821)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16
2019-12-05 00:20:40 +00:00
William Li
289a20ce15
Merge branch 'release/3.1.2xx' into merge/release/3.1.1xx-to-release/3.1.2xx 2019-12-03 11:24:24 -08:00
dotnet-maestro[bot]
41d2445a6b
Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#5811)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5
2019-12-02 18:48:28 +00:00
dotnet-maestro[bot]
85a5ef8eef
Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#5799)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5
2019-11-28 01:33:16 +00:00
dotnet-maestro[bot]
655bd1a02e
Update dependencies from https://github.com/dotnet/core-setup build 20191126.4 (#5791)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.4
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.4
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.4
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.4
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.4
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.4
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.4
2019-11-26 23:35:44 +00:00
Daniel Plaisted
24f420c1e8
Merge pull request #5634 from halex2005/nunit3templates-update
NUnit3Templates update
2019-11-26 14:07:24 -08:00
dotnet-maestro[bot]
1e2e7f4fa1
Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#5766)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3
2019-11-26 16:43:04 +00:00
William Godbe
458eb288fa
Add trigger for internal builds (#5784) 2019-11-25 17:28:25 -08:00
dotnet-maestro[bot]
d32a342ff3
Update dependencies from https://github.com/dotnet/core-setup build 20191125.1 (#5783)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19575.1
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19575.1
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19575.1
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19575.1
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19575.1
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19575.1
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19575.1
2019-11-25 19:50:44 +00:00
dotnet-maestro[bot]
78f2d34f5c
Update dependencies from https://github.com/aspnet/AspNetCore build 20191123.3 (#5781)
- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19573.3
- dotnet-user-secrets - 3.1.0-rtm.19573.3
- dotnet-watch - 3.1.0-rtm.19573.3
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19573.3
2019-11-23 22:20:41 +00:00
dotnet-maestro[bot]
a8858b765a
Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.19 (#5778)
- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.19
- dotnet-user-secrets - 3.1.0-rtm.19572.19
- dotnet-watch - 3.1.0-rtm.19572.19
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19572.19
2019-11-23 08:25:41 +00:00
dotnet-maestro[bot]
33541a04e6
[release/3.1.1xx] Update dependencies from dotnet/core-setup (#5772)
* Update dependencies from https://github.com/dotnet/core-setup build 20191122.6

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.6
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.6
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.6
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.6
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.6
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.6
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.6

* Update dependencies from https://github.com/dotnet/core-setup build 20191122.8

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.8
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.8
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.8
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.8
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.8
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.8
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.8

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19572.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2019-11-23 07:26:51 +00:00
dotnet-maestro[bot]
bd9d341985
[release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5769)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.12

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.12
- dotnet-user-secrets - 3.1.0-rtm.19572.12
- dotnet-watch - 3.1.0-rtm.19572.12
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19572.12

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.16

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.16
- dotnet-user-secrets - 3.1.0-rtm.19572.16
- dotnet-watch - 3.1.0-rtm.19572.16
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19572.16
2019-11-23 05:51:48 +00:00
William Li
b6563a900c
Merge pull request #5765 from wli3/update-branding-3.1.101-servicing
update branding 3.1.101 servicing
2019-11-22 16:16:34 -08:00
William Li
036e7afaff update branding 3.1.101 servicing 2019-11-22 13:29:45 -08:00
dotnet-maestro[bot]
f4638c0515
[release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5718)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191119.2

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19569.2
- dotnet-user-secrets - 3.1.0-rtm.19569.2
- dotnet-watch - 3.1.0-rtm.19569.2
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19569.2

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191121.5

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19571.5
- dotnet-user-secrets - 3.1.0-rtm.19571.5
- dotnet-watch - 3.1.0-rtm.19571.5
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19571.5
2019-11-22 09:31:46 +00:00
dotnet-maestro[bot]
af3e3b8f83
Update dependencies from https://github.com/dotnet/core-setup build 20191121.5 (#5747)
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19571.5
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
- Microsoft.NETCore.App.Ref - 3.1.0

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19570.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2019-11-22 02:30:46 +00:00
William Li
9018671d62
Set DropSuffix=false (#5737) 2019-11-21 11:22:15 -08:00
William Li
fc3c44a49c Update branding to 3.1.200 preview1 2019-11-21 10:23:59 -08:00
dotnet-maestro[bot]
f6f640183e
Update dependencies from https://github.com/dotnet/core-setup build 20191120.3 (#5733)
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19570.3
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
- Microsoft.NETCore.App.Ref - 3.1.0
2019-11-21 01:01:04 +00:00
dotnet-maestro[bot]
b9945282f1
Update dependencies from https://github.com/dotnet/toolset build 20191120.7 (#5730)
- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19570.7
2019-11-20 22:50:53 +00:00
dotnet-maestro[bot]
7112d62479
[release/3.1.1xx] Update dependencies from dotnet/toolset (#5723)
* Update dependencies from https://github.com/dotnet/toolset build 20191119.4

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19569.4

* Update dependencies from https://github.com/dotnet/toolset build 20191120.6

- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19570.6
2019-11-20 22:15:11 +00:00
dotnet-maestro[bot]
7d6fe0f7e0
Update dependencies from https://github.com/dotnet/arcade build 20191119.2 (#5729)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2
2019-11-20 21:35:33 +00:00
dotnet-maestro[bot]
3b48f0ada3
Update dependencies from https://github.com/dotnet/toolset build 20191119.3 (#5720)
- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19569.3
2019-11-19 15:05:46 +00:00
dotnet-maestro[bot]
196657464d
Update dependencies from https://github.com/dotnet/toolset build 20191119.1 (#5716)
- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19569.1

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19568.3 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-11-19 09:50:54 +00:00
dotnet-maestro[bot]
bb14bbcb76
Update dependencies from https://github.com/dotnet/toolset build 20191118.7 (#5714)
- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.7
2019-11-19 09:05:03 +00:00
dotnet-maestro[bot]
0996eec117
Update dependencies from https://github.com/dotnet/toolset build 20191118.6 (#5713)
- Microsoft.Dotnet.Toolset.Internal - 3.1.100-rtm.19568.6

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-rtm.19568.2 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-11-19 08:20:19 +00:00
dotnet-maestro[bot]
d9d82feb4e
Update dependencies from https://github.com/dotnet/core-setup build 20191118.2 (#5712)
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19568.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
- Microsoft.NETCore.App.Ref - 3.1.0

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-rtm.19568.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19568.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2019-11-19 08:05:48 +00:00