Matt Mitchell
e71f449275
Merge pull request #5856 from mmitche/merge-from-release/3.0.1xx
...
[release/3.1.1xx] Merge from release/3.0.1xx
2019-12-09 12:07:59 -08:00
Matt Mitchell
e382ec542b
Fixup indentation
2019-12-09 08:11:52 -08:00
Matt Mitchell
40a92b5d67
Fixup version patch
2019-12-09 08:11:28 -08:00
Matt Mitchell
2b6bd1474e
Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-release/3.0.1xx
2019-12-09 08:07:02 -08:00
dotnet-maestro[bot]
fc205e109d
Update dependencies from https://github.com/dotnet/arcade build 20191208.1 ( #5854 )
...
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19608.1
2019-12-09 14:06:10 +00:00
dotnet-maestro[bot]
f39e2232e6
Update dependencies from https://github.com/dotnet/arcade build 20191207.1 ( #5849 )
...
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19607.1
2019-12-08 13:35:47 +00: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
dotnet-maestro[bot]
2beb6e6c15
Update dependencies from https://github.com/dotnet/arcade build 20191207.3 ( #5847 )
...
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19607.3
2019-12-08 01:12:57 +00:00
Divino César
624ec5e7b3
Augment DownloadFile task to make it able to download from public/private location ( #5414 )
...
* Patch to DownloadFile: retries + only use PrivateUri on 404 errors.
* Refactor PrivateURL in GenerateLayout.targets
* Address PR feedback.
* Addressing PR feedback.
* PR feedback
* PR feedback. Bug fix.
* Removing test related typo
* Fixup blob replacement
* Fixup blob replacement
* Broaden usage of read sas token to include PRs
2019-12-07 15:05:24 -08:00
Divino César
4004a7f199
Update dockerrun.sh ( #5309 )
2019-12-07 07:47:03 -08: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
dotnet-maestro[bot]
ec98bc24e4
Update dependencies from https://github.com/dotnet/arcade build 20191206.1 ( #5844 )
...
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19606.1
2019-12-07 13:35:58 +00: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
Matt Mitchell
46d6c84bd4
Enable ci on internal branches ( #5840 )
2019-12-06 15:28:16 -08: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
dotnet-maestro[bot]
fc1d995e46
[master] Update dependencies from dotnet/arcade ( #5831 )
...
* Update dependencies from https://github.com/dotnet/arcade build 20191205.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19605.1
* Update dependencies from https://github.com/dotnet/arcade build 20191205.6
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19605.6
2019-12-06 13:31:33 +00:00
dotnet-maestro[bot]
6379235b25
Update dependencies from https://github.com/aspnet/AspNetCore build 20191205.16 ( #5837 )
...
- VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-alpha1.19605.16
- dotnet-user-secrets - 5.0.0-alpha1.19605.16
- dotnet-watch - 5.0.0-alpha1.19605.16
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19605.16
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19605.16
- dotnet-dev-certs - 5.0.0-alpha1.19605.16
2019-12-06 05:55:34 +00:00
dotnet-maestro[bot]
502d35225a
Update dependencies from https://github.com/aspnet/AspNetCore build 20191205.10 ( #5836 )
...
- VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-alpha1.19605.10
- dotnet-user-secrets - 5.0.0-alpha1.19605.10
- dotnet-watch - 5.0.0-alpha1.19605.10
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19605.10
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19605.10
- dotnet-dev-certs - 5.0.0-alpha1.19605.10
2019-12-06 03:25:44 +00:00
msftbot[bot]
de3002b80e
Merge pull request #5812 from dotnet-maestro-bot/merge/release/3.1.2xx-to-master
...
[automated] Merge branch 'release/3.1.2xx' => 'master'
2019-12-06 00:34:16 +00:00
Nick Guerrera
aece614333
Fix merge error in arcade version
2019-12-05 16:03:56 -08:00
Nick Guerrera
c70a1f79eb
Fix merge error in SDK version
2019-12-05 16:03:19 -08:00
Nick Guerrera
c474478a44
Merge remote-tracking branch 'dotnet-maestro-bot/merge/release/3.1.2xx-to-master' into merge/release/3.1.2xx-to-master
2019-12-05 16:01:14 -08:00
Nick Guerrera
41d020cd32
Merge branch 'master' into merge/release/3.1.2xx-to-master
2019-12-05 15:48:22 -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]
f53322dd53
Update dependencies from https://github.com/dotnet/arcade build 20191205.2 ( #5834 )
...
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19605.2
2019-12-05 23:01: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]
f864fc8dea
Update dependencies from https://github.com/dotnet/core-setup build 20191126.08 ( #5795 )
...
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-08
- Microsoft.NETCore.DotNetHostResolver - 3.0.2-servicing-19576-08
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.2-servicing-19576-08
- Microsoft.NETCore.App.Host.win-x64 - 3.0.2-servicing-19576-08
- Microsoft.NETCore.App.Internal - 3.0.2-servicing-19576-08
Dependency coherency updates
- Microsoft.NETCore.Platforms - 3.0.1-servicing.19576.7 (parent: Microsoft.NETCore.App.Internal)
2019-12-05 19:43:46 +00:00
dotnet-maestro[bot]
ba831f9396
[release/3.0.1xx] Update dependencies from dotnet/toolset ( #5790 )
...
* Update dependencies from https://github.com/dotnet/toolset build 20191126.7
- Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19576.7
* Update dependencies from https://github.com/dotnet/toolset build 20191126.8
- Microsoft.Dotnet.Toolset.Internal - 3.0.102-servicing.19576.8
2019-12-05 19:42:18 +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]
e355d9c8d0
Update dependencies from https://github.com/aspnet/AspNetCore build 20191205.1 ( #5826 )
...
- dotnet-user-secrets - 5.0.0-alpha1.19605.1
- dotnet-watch - 5.0.0-alpha1.19605.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19605.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19605.1
- dotnet-dev-certs - 5.0.0-alpha1.19605.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19605.1
2019-12-05 19:37:08 +00:00
dotnet-maestro[bot]
57907a828a
Update dependencies from https://github.com/dotnet/arcade build 20191204.4 ( #5825 )
...
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19604.4
2019-12-05 19:33:57 +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
dotnet-maestro[bot]
307fb4cc1e
Update dependencies from https://github.com/dotnet/arcade build 20191203.16 ( #5822 )
...
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16
2019-12-05 00:18:42 +00:00
dotnet-maestro[bot]
b66140fa66
Update dependencies from https://github.com/dotnet/arcade build 20191203.17 ( #5819 )
...
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19603.17
2019-12-04 13:31:24 +00:00
dotnet-maestro[bot]
cea32db3f2
Update dependencies from https://github.com/aspnet/AspNetCore build 20191203.5 ( #5818 )
...
- dotnet-user-secrets - 5.0.0-alpha1.19603.5
- dotnet-watch - 5.0.0-alpha1.19603.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19603.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19603.5
- dotnet-dev-certs - 5.0.0-alpha1.19603.5
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19603.5
2019-12-04 06:40:35 +00:00
dotnet-maestro[bot]
d5f593864b
Update dependencies from https://github.com/aspnet/AspNetCore build 20191203.4 ( #5817 )
...
- dotnet-user-secrets - 5.0.0-alpha1.19603.4
- dotnet-watch - 5.0.0-alpha1.19603.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19603.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19603.4
- dotnet-dev-certs - 5.0.0-alpha1.19603.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19603.4
2019-12-04 03:25:34 +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]
27e8d3ec42
Update dependencies from https://github.com/dotnet/arcade build 20191202.4 ( #5815 )
...
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19602.4
2019-12-03 13:31:44 +00:00