Commit graph

26070 commits

Author SHA1 Message Date
dotnet-maestro[bot]
0a0ec693cf Update dependencies from https://github.com/dotnet/sdk build 20220609.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.2

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.7 (parent: Microsoft.NET.Sdk
2022-06-09 11:49:55 +00:00
dotnet-maestro[bot]
7852b8793d Update dependencies from https://github.com/dotnet/sdk build 20220609.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22309.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.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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-09 10:29:41 +00:00
Jason Zhai
732667a98a Merge branch 'release/6.0.4xx' into main 2022-06-09 02:49:42 -07:00
Jakub Jareš
47c53d5fa0
Merge pull request #13939 from nohwnd/fix-dump-minitool 2022-06-09 10:12:01 +02:00
Jakub Jareš
57b0eb4406
Merge pull request #13942 from nohwnd/fix-dump-minitool-net6 2022-06-09 10:09:19 +02:00
dotnet-maestro[bot]
58597c74fc Update dependencies from https://github.com/dotnet/sdk build 20220608.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.16

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-09 07:49:35 +00:00
Jakub Jareš
0c7c5381b9 Fix cross-gen for DumpMinitool 2022-06-09 08:06:36 +02:00
dotnet-maestro[bot]
8bccd27797 Update dependencies from https://github.com/dotnet/sdk build 20220608.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.15

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-09 05:07:21 +00:00
dotnet-maestro[bot]
e2fa0c73e4 Update dependencies from https://github.com/dotnet/sdk build 20220608.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-09 00:44:30 +00:00
dotnet-maestro[bot]
4d8bc175e7 Update dependencies from https://github.com/dotnet/sdk build 20220608.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.11

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-08 23:31:30 +00:00
dotnet-maestro[bot]
c872893e63 Update dependencies from https://github.com/dotnet/sdk build 20220608.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22308.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.2 (parent: Microsoft.NET.Sdk
2022-06-08 22:25:43 +00:00
dotnet-maestro[bot]
4a6c3dc2ea Update dependencies from https://github.com/dotnet/sdk build 20220608.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-08 22:14:41 +00:00
dotnet-maestro[bot]
1003baae58
Update dependencies from https://github.com/dotnet/arcade build 20220606.2 (#13940)
[main] Update dependencies from dotnet/arcade
2022-06-08 21:23:10 +00:00
dotnet-maestro[bot]
44961477d5 Update dependencies from https://github.com/dotnet/sdk build 20220608.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.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.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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-08 21:09:11 +00:00
dotnet-bot
5c16deae09 Merge in 'release/6.0.3xx' changes 2022-06-08 20:17:11 +00:00
Marc Paine
138d21e534
Merge pull request #13863 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build by getting debuild first
2022-06-08 13:05:45 -07:00
Marc Paine
fd0c042c55
Merge pull request #13864 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build
2022-06-08 13:05:42 -07:00
Marc Paine
92f9b7b00d
Merge pull request #13908 from dotnet/marcpopMSFT-fixdebbuild
Remove the external docker files and fix the debbuild
2022-06-08 13:05:34 -07:00
dotnet-maestro[bot]
724b356a03 Update dependencies from https://github.com/dotnet/sdk build 20220608.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.3

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-08 19:06:15 +00:00
dotnet-maestro[bot]
b970c4b70e Update dependencies from https://github.com/dotnet/sdk build 20220608.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22308.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22305.4 -> To Version 4.3.0-2.22307.7 (parent: Microsoft.NET.Sdk
2022-06-08 18:54:35 +00:00
Jo Shields
15e1a9aee6
Merge pull request #13909 from directhex/bionic-means-bionic
Add linux-bionic-* known runtime packs
2022-06-08 13:10:20 -04:00
dotnet-maestro[bot]
206786418f Update dependencies from https://github.com/dotnet/sdk build 20220608.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22308.2

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Build
 From Version 7.0.0-preview.6.22306.1 -> To Version 7.0.0-preview.6.22307.2 (parent: Microsoft.NET.Sdk
2022-06-08 16:42:03 +00:00
Jo Shields
7bb09b3f1c
Update src/redist/targets/GenerateBundledVersions.targets
Co-authored-by: Mitchell Hwang <16830051+mdh1418@users.noreply.github.com>
2022-06-08 10:30:15 -04:00
Jakub Jareš
a1fbbff57a Fix cross-gen for dumpMinitool 2022-06-08 12:42:54 +02:00
v-wuzhai
2fbf048152
Merge pull request #13937 from dotnet/darc-release/6.0.4xx-4facdbb3-4621-4ad1-bda9-4be1e0a22a11
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-08 02:41:24 -07:00
dotnet-maestro[bot]
0a35a38607 Update dependencies from https://github.com/dotnet/sdk build 20220607.28
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22307.28

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,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-08 05:39:53 +00:00
dotnet-maestro[bot]
ccf138f40c Update dependencies from https://github.com/dotnet/sdk build 20220607.25
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22307.25

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-jwts,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,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-08 04:05:42 +00:00
dotnet-maestro[bot]
67edc966b7 Update dependencies from https://github.com/dotnet/sdk build 20220607.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22306.16 -> To Version 7.0.100-preview.6.22307.21

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-jwts,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,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-08 03:24:01 +00:00
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
dotnet-bot
e2914842f2 Merge in 'release/6.0.3xx' changes 2022-06-08 02:10:52 +00: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
dotnet-bot
8f64372c07 Merge in 'release/6.0.3xx' changes 2022-06-07 18:59:29 +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