Commit graph

25034 commits

Author SHA1 Message Date
dotnet-maestro[bot]
36b92cafe5 Update dependencies from https://github.com/dotnet/sdk build 20220607.22
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22306.13 -> To Version 6.0.400-preview.22307.22
2022-06-08 03:03:28 +00:00
Jason Zhai
52d1c3a60b Merge branch 'main' of https://github.com/dotnet/installer into darc-main-35ef31d8-269d-48e8-9f6d-854d2df01a85 2022-06-07 19:51:22 -07:00
v-wuzhai
6eb484a785
Merge pull request #13934 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-06-07 18:59:53 -07:00
v-wuzhai
9bb91df157
Merge pull request #13935 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-06-07 18:57:11 -07:00
Safia Abdalla
116a6a8bc5
Integrate new user-jwts tool into installer (#13895) (#13913) 2022-06-07 15:20:07 -07:00
dotnet-maestro[bot]
8d4b9b31fc Update dependencies from https://github.com/dotnet/sdk build 20220607.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22307.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,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.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22306.3 (parent: Microsoft.NET.Sdk
2022-06-07 21:34:56 +00:00
Marc Paine
e7c0f1e3b0
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-06-07 13:40:20 -07:00
Marc Paine
87bee21ceb
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-06-07 13:40:05 -07:00
Marc Paine
d560c613b1
Merge pull request #13933 from dotnet/darc-main-ddcae454-a96f-4f4c-abac-bdceb0e80bcf
[main] Update dependencies from dotnet/test-templates
2022-06-07 13:39:07 -07:00
dotnet-maestro[bot]
fac3e576fc Update dependencies from https://github.com/dotnet/sdk build 20220607.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22307.8

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22306.3 (parent: Microsoft.NET.Sdk
2022-06-07 20:09:23 +00:00
Marc Paine
2f68ca3164
Merge pull request #13870 from dotnet/mmitche-patch-2
[release/6.0.3xx] Update pre-release label to servicing
2022-06-07 11:53:02 -07:00
Marc Paine
510e7df7cb
Merge pull request #13928 from dotnet/darc-main-da8a6d21-562e-417c-a9a3-b18f33d3823a
[main] Update dependencies from dotnet/arcade
2022-06-07 11:52:07 -07:00
Marc Paine
fd1be0cbdf
Merge pull request #13930 from vseanreesermsft/branding-6.0.107-2022-06-07-1000
Update branding to 6.0.107
2022-06-07 11:48:05 -07:00
Marc Paine
0dd3622172
Merge pull request #13931 from vseanreesermsft/branding-6.0.302-2022-06-07-1000
Update branding to 6.0.302
2022-06-07 11:47:41 -07:00
dotnet-maestro[bot]
1ea7df81be Update dependencies from https://github.com/dotnet/test-templates build 20220607.1
Microsoft.DotNet.Test.ProjectTemplates.2.1 , Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22261.1 -> To Version 1.0.2-beta4.22307.1
2022-06-07 18:30:34 +00:00
dotnet-maestro[bot]
fe9f69f4d1 Update dependencies from https://github.com/dotnet/sdk build 20220607.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22307.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22306.3 (parent: Microsoft.NET.Sdk
2022-06-07 18:07:57 +00:00
Sean Reeser
9988564da9 Update branding to 6.0.302 2022-06-07 10:00:18 -07:00
Sean Reeser
5fcd191cd0 Update branding to 6.0.107 2022-06-07 10:00:12 -07:00
Jo Shields
fe8ff26c2f Suggestions from Mitch 2022-06-07 10:42:47 -04:00
Jo Shields
1aff5868fe Address suggestions from Alex 2022-06-07 10:40:28 -04:00
Jo Shields
9ce0f2d93f Merge remote-tracking branch 'origin/main' into bionic-means-bionic 2022-06-07 10:37:28 -04:00
dotnet-maestro[bot]
4aba1f218c Update dependencies from https://github.com/dotnet/arcade build 20220606.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22301.2 -> To Version 7.0.0-beta.22306.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.22281.1 -> To Version 1.0.0-beta.22302.1 (parent: Microsoft.DotNet.Arcade.Sdk
2022-06-07 12:34:12 +00:00
v-wuzhai
6211f85f58
Merge pull request #13927 from dotnet/darc-main-cd484990-6a49-45ac-888e-32937c6c22db
[main] Update dependencies from dotnet/sdk
2022-06-07 01:24:09 -07:00
dotnet-maestro[bot]
8bda3ef581 Update dependencies from https://github.com/dotnet/sdk build 20220606.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.15 -> To Version 7.0.100-preview.6.22306.16

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets
 From Version 7.0.0-preview.6.22306.6 -> To Version 7.0.0-preview.6.22306.7 (parent: Microsoft.NET.Sdk
2022-06-07 06:59:23 +00:00
v-wuzhai
92b6131a36
Merge pull request #13926 from dotnet/darc-main-1ef8d760-6b64-4cb3-8761-6adeacaeedf6
[main] Update dependencies from dotnet/sdk
2022-06-06 23:27:46 -07:00
dotnet-maestro[bot]
c141dc30b2 Update dependencies from https://github.com/dotnet/sdk build 20220606.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.12 -> To Version 7.0.100-preview.6.22306.15

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets
 From Version 7.0.0-preview.6.22306.3 -> To Version 7.0.0-preview.6.22306.6 (parent: Microsoft.NET.Sdk
2022-06-07 05:20:08 +00:00
dotnet-maestro[bot]
1791d370b6 Update dependencies from https://github.com/dotnet/sdk build 20220606.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.12 -> To Version 7.0.100-preview.6.22306.14

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets
 From Version 7.0.0-preview.6.22306.3 -> To Version 7.0.0-preview.6.22306.5 (parent: Microsoft.NET.Sdk
2022-06-07 04:01:57 +00:00
v-wuzhai
d171b8457c
Merge pull request #13920 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-06-06 20:40:52 -07:00
Jason Zhai
b5977a7d2f Merge branch 'release/6.0.4xx' into main 2022-06-06 19:45:54 -07:00
v-wuzhai
8334a5deb0
Merge pull request #13923 from dotnet/darc-main-6d9370dd-3c69-4306-877b-766cae399d84
[main] Update dependencies from dotnet/sdk
2022-06-06 18:59:33 -07:00
v-wuzhai
60a1e77ceb
Merge pull request #13925 from dotnet/darc-release/6.0.4xx-1dd38747-567c-48bc-8bdd-f3735c156bd5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-06 18:57:27 -07:00
dotnet-maestro[bot]
ae8b05a2dd Update dependencies from https://github.com/dotnet/sdk build 20220606.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22306.1 -> To Version 6.0.400-preview.22306.13

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.400-preview.22276.4 -> To Version 6.0.400-preview.22306.2 (parent: Microsoft.NET.Sdk
2022-06-07 00:11:37 +00:00
dotnet-maestro[bot]
4f29e1cac6 Update dependencies from https://github.com/dotnet/sdk build 20220606.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.5 -> To Version 7.0.100-preview.6.22306.12

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,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
 From Version 7.0.0-preview.6.22303.4 -> To Version 7.0.0-preview.6.22306.1 (parent: Microsoft.NET.Sdk
2022-06-06 23:29:51 +00:00
dotnet-maestro[bot]
54819d4663 Update dependencies from https://github.com/dotnet/sdk build 20220606.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.5 -> To Version 7.0.100-preview.6.22306.9

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,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
 From Version 7.0.0-preview.6.22303.4 -> To Version 7.0.0-preview.6.22306.1 (parent: Microsoft.NET.Sdk
2022-06-06 22:15:18 +00:00
dotnet-maestro[bot]
308a455f4d Update dependencies from https://github.com/dotnet/sdk build 20220606.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.5 -> To Version 7.0.100-preview.6.22306.8

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,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
 From Version 7.0.0-preview.6.22303.4 -> To Version 7.0.0-preview.6.22306.1 (parent: Microsoft.NET.Sdk
2022-06-06 21:00:20 +00:00
dotnet-maestro[bot]
8f08cbc75a Update dependencies from https://github.com/dotnet/sdk build 20220606.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.5 -> To Version 7.0.100-preview.6.22306.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,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
 From Version 7.0.0-preview.6.22303.4 -> To Version 7.0.0-preview.6.22306.1 (parent: Microsoft.NET.Sdk
2022-06-06 19:08:57 +00:00
dotnet-maestro[bot]
db3e3ec28b Update dependencies from https://github.com/dotnet/sdk build 20220606.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.5 -> To Version 7.0.100-preview.6.22306.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-preview.6.22303.4 -> To Version 7.0.0-preview.6.22306.1 (parent: Microsoft.NET.Sdk
2022-06-06 17:42:43 +00:00
Grace Kulin
ed7ccdf369
Merge pull request #13921 from dotnet/darc-main-b65e0805-97e9-4775-a635-165359b10207
[main] Update dependencies from dotnet/sdk
2022-06-06 10:02:17 -07:00
dotnet-maestro[bot]
08c5a4b1a7 Update dependencies from https://github.com/dotnet/sdk build 20220606.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.3 -> To Version 7.0.100-preview.6.22306.5

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.6.22304.5 -> To Version 7.0.0-preview.6.22305.4 (parent: Microsoft.NET.Sdk
2022-06-06 14:57:10 +00:00
dotnet-maestro[bot]
844b41c3ad Update dependencies from https://github.com/dotnet/sdk build 20220606.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.3 -> To Version 7.0.100-preview.6.22306.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli
 From Version 7.0.100-preview.6.22302.3 -> To Version 7.0.100-preview.6.22306.1 (parent: Microsoft.NET.Sdk
2022-06-06 12:51:06 +00:00
v-wuzhai
1e2223659d
Merge pull request #13917 from dotnet/darc-main-9e693041-dd54-4243-8234-6ea063fca7ce
[main] Update dependencies from dotnet/sdk
2022-06-06 03:09:26 -07:00
v-wuzhai
a6fed140e4
Merge pull request #13918 from dotnet/darc-release/6.0.4xx-c08e1dbe-926c-45e9-a805-ce139af813d5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-06 02:57:48 -07:00
dotnet-maestro[bot]
4a6f159dee Update dependencies from https://github.com/dotnet/sdk build 20220606.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22305.4 -> To Version 7.0.100-preview.6.22306.3

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22305.1 -> To Version 4.3.0-3.22305.4 (parent: Microsoft.NET.Sdk
2022-06-06 09:12:56 +00:00
dotnet-maestro[bot]
d9b148b612 Update dependencies from https://github.com/dotnet/sdk build 20220606.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22303.15 -> To Version 6.0.400-preview.22306.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22303.4 -> To Version 12.0.4-beta.22305.1 (parent: Microsoft.NET.Sdk
2022-06-06 07:59:53 +00:00
dotnet-maestro[bot]
abe2baa475 Update dependencies from https://github.com/dotnet/sdk build 20220605.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22305.4 -> To Version 7.0.100-preview.6.22305.5

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22305.1 -> To Version 4.3.0-3.22305.2 (parent: Microsoft.NET.Sdk
2022-06-06 07:30:31 +00:00
v-wuzhai
3b757345e9
Merge pull request #13916 from dotnet/darc-main-e2c01891-b8d3-4bc0-b5be-dda438378c05
[main] Update dependencies from dotnet/sdk
2022-06-06 00:02:32 -07:00
v-wuzhai
b51c3de049
Merge pull request #13905 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-06-05 20:44:52 -07:00
dotnet-maestro[bot]
032b46594b Update dependencies from https://github.com/dotnet/sdk build 20220605.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22305.3 -> To Version 7.0.100-preview.6.22305.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22304.2 -> To Version 4.3.0-3.22305.1 (parent: Microsoft.NET.Sdk
2022-06-06 03:36:53 +00:00
Jason Zhai
8ad487e472 Merge branch 'release/6.0.4xx' into main 2022-06-05 19:56:47 -07:00
v-wuzhai
7f8bdde4ae
Merge pull request #13915 from dotnet/darc-main-c524379b-be0e-4f20-9fe2-21fe448723c9
[main] Update dependencies from dotnet/sdk
2022-06-05 19:25:29 -07:00