Commit graph

25543 commits

Author SHA1 Message Date
Marc Paine
1837d35782
Updating branding to rc1 2022-07-12 17:26:29 -07:00
dotnet-maestro[bot]
13a3901c10 Update dependencies from https://github.com/dotnet/sdk build 20220712.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.18

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.2 (parent: Microsoft.NET.Sdk
2022-07-12 23:04:27 +00:00
Marc Paine
b81dfada12
Update BundledTemplates.targets 2022-07-12 15:58:08 -07:00
Marc Paine
d2fff6df58
Merge pull request #14119 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-07-12 15:56:33 -07:00
Marc Paine
96fd3f4e9d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-07-12 15:55:24 -07:00
Marc Paine
667bae46a4
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-12 15:53:48 -07:00
dotnet-maestro[bot]
50bd0f6567 Update dependencies from https://github.com/dotnet/sdk build 20220712.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.14
2022-07-12 21:49:35 +00:00
Logan Bussell
9e15400e31
Revert aspnetcore SDK update commit 2022-07-12 14:00:02 -07:00
dotnet-maestro[bot]
eedc6acf29 Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 19:53:02 +00:00
dotnet-maestro[bot]
1c2563cc32 Update dependencies from https://github.com/dotnet/sdk build 20220712.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22362.4 -> To Version 7.0.100-preview.7.22362.5
2022-07-12 19:52:49 +00:00
dotnet-maestro[bot]
77258553a9 Update dependencies from https://github.com/dotnet/sdk build 20220712.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22362.4
2022-07-12 19:52:35 +00:00
William Godbe
9af47dc205
Update Asp.Net template (#14113)
* Update Asp.Net template

* Update GenerateBundledVersions.targets

* Update Versions.props
2022-07-12 19:34:25 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
William Godbe
853275fdcb
Update Asp.Net template (#14111) 2022-07-12 12:13:55 -07:00
William Godbe
e22344fc38
Update asp.net template version (#14112) 2022-07-12 12:13:47 -07:00
Marc Paine
310d3c954f
Merge pull request #14114 from wtgodbe/internal-merge-6.0.3xx-2022-07-12-1057
Merging internal commits for release/6.0.3xx
2022-07-12 12:10:30 -07:00
Marc Paine
7bc522bbb6
Merge pull request #14115 from wtgodbe/internal-merge-6.0.1xx-2022-07-12-1057
Merging internal commits for release/6.0.1xx
2022-07-12 12:10:27 -07:00
Will Godbe
23a55e8341 Merge commit 'f6ec7508e3b20ad6fbc4ffa8ea4ed8818ffccc1d' into internal-merge-6.0.1xx-2022-07-12-1057 2022-07-12 10:57:21 -07:00
Will Godbe
4d81493240 Merge commit 'c857713418e715e1ca1a5c9fa5c360aaf71d2231' into internal-merge-6.0.3xx-2022-07-12-1057 2022-07-12 10:57:14 -07:00
Logan Bussell
98d5be7aaa
Add devcontainer configurations for source build (#14084)
* Add devcontainer configurations for source build
2022-07-12 17:33:54 +00:00
Marc Paine
fcac10b492
Merge pull request #14082 from mmitche/branding-6.0.303-2022-07-05-1230
Update branding to 6.0.303
2022-07-12 09:17:07 -07:00
Grace Kulin
c27dc5d1e4
Merge pull request #14108 from dotnet/darc-main-088989c2-ee45-4e92-984a-ff2face3959f
[main] Update dependencies from dotnet/test-templates
2022-07-12 09:01:56 -07:00
MichaelSimons
a4f704210d Merge branch 'darc-main-004b9fc9-8a00-48dc-8968-1e96c744fb5b' of https://github.com/dotnet/installer into darc-main-004b9fc9-8a00-48dc-8968-1e96c744fb5b 2022-07-12 13:45:23 +00:00
MichaelSimons
628c8565e2 source-build patch updates 2022-07-12 13:45:08 +00:00
dotnet-maestro[bot]
325abc78c3 Update dependencies from https://github.com/dotnet/sdk build 20220712.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22362.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.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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 13:31:31 +00:00
dotnet-maestro[bot]
eeb1bfd24d Update dependencies from https://github.com/dotnet/test-templates build 20220712.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.22357.1 -> To Version 1.0.2-beta4.22362.1
2022-07-12 12:24:26 +00:00
dotnet-maestro[bot]
5dc3b03e88 Update dependencies from https://github.com/dotnet/sdk build 20220712.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22362.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.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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 12:10:57 +00:00
dotnet-maestro[bot]
3bad15b39f Update dependencies from https://github.com/dotnet/sdk build 20220712.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22362.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.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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 10:48:46 +00:00
dotnet-maestro[bot]
872a0e41c4 Update dependencies from https://github.com/dotnet/sdk build 20220711.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22361.20

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 08:11:13 +00:00
v-wuzhai
55b77fbb6b
Merge pull request #14106 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-07-12 00:48:52 -07:00
dotnet-maestro[bot]
fc255b6cf3 Update dependencies from https://github.com/dotnet/sdk build 20220711.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22361.19

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 06:51:18 +00:00
Jason Zhai
dedd63e4d6 Merge branch 'release/6.0.4xx' into main 2022-07-11 23:45:34 -07:00
dotnet-maestro[bot]
2ebc1e59c2 Update dependencies from https://github.com/dotnet/sdk build 20220711.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22361.18

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 04:06:21 +00:00
dotnet-maestro[bot]
7f2f3ba9f8 Update dependencies from https://github.com/dotnet/sdk build 20220711.17
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22361.17

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 03:03:05 +00:00
v-wuzhai
dd1baed893
Merge pull request #14105 from dotnet/darc-release/6.0.4xx-cbcfeb9b-5f60-40bd-9b18-50ae67fa66f9
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 19:20:41 -07:00
dotnet-maestro[bot]
1b8e40c56f Update dependencies from https://github.com/dotnet/sdk build 20220711.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22361.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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 02:09:55 +00:00
v-wuzhai
d44674b4db
Merge pull request #14102 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-07-11 18:40:00 -07:00
dotnet-maestro[bot]
61bc9b4a85 Update dependencies from https://github.com/dotnet/sdk build 20220711.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22361.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.ILLink.Tasks,Microsoft.Build
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-12 00:33:55 +00:00
dotnet-maestro[bot]
6a9c07da4d Update dependencies from https://github.com/dotnet/sdk build 20220711.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.7 -> To Version 6.0.400-preview.22361.12
2022-07-11 23:21:37 +00:00
Grace Kulin
d8947e4fe2
Merge pull request #14104 from dotnet/darc-release/6.0.4xx-625886fc-478d-4959-9e60-accd4b88bc0e
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 14:58:24 -07:00
dotnet-maestro[bot]
ef25719e7c Update dependencies from https://github.com/dotnet/sdk build 20220711.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22356.20 -> To Version 6.0.400-preview.22361.7

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.3.0-release-20220627-03 -> To Version 17.3.0-release-20220708-01 (parent: Microsoft.NET.Sdk
2022-07-11 17:11:21 +00:00
MichaelSimons
196eb0b097 Disable VerifyTargetingPacksHaveDoc until product issue is fixed 2022-07-11 14:41:34 +00:00
v-wuzhai
85a0482297
Merge pull request #14101 from dotnet/darc-main-91f6903d-80f6-4d1e-b6ea-53c6c1d9f562
[main] Update dependencies from dotnet/arcade
2022-07-11 00:05:49 -07:00
v-wuzhai
49f92edbb1
Merge pull request #14097 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-07-10 18:19:54 -07:00
dotnet-maestro[bot]
b1a0184914 Update dependencies from https://github.com/dotnet/arcade build 20220708.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22356.3 -> To Version 7.0.0-beta.22358.3

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22355-01 -> To Version 1.2.0-beta-22357-02 (parent: Microsoft.DotNet.Arcade.Sdk
2022-07-09 12:36:15 +00:00
Marc Paine
f8fb662f9f
Merge pull request #14098 from dotnet/marcpopMSFT-addreleases
Add the releases dll to the msbuild sdk resolvers folder.
2022-07-08 16:05:04 -07:00
dotnet-maestro[bot]
4a64d73cd1 Update dependencies from https://github.com/dotnet/sdk build 20220708.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22358.10

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
 From Version 7.0.0-preview.7.22355.1 -> To Version 7.0.0-preview.7.22357.2 (parent: Microsoft.NET.Sdk
2022-07-08 20:54:57 +00:00
Marc Paine
51754b4c58
Fix pathing issue in the releases layout in the nuget file 2022-07-08 12:10:15 -07:00
dotnet-maestro[bot]
8772def341 Update dependencies from https://github.com/dotnet/sdk build 20220708.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22358.5

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli
 From Version 7.0.0-preview.7.22356.9 -> To Version 7.0.0-preview.7.22357.7 (parent: Microsoft.NET.Sdk
2022-07-08 18:55:02 +00:00
dotnet-maestro[bot]
396e79039b Update dependencies from https://github.com/dotnet/sdk build 20220708.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.7.22358.1 -> To Version 7.0.100-preview.7.22358.4

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-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli
 From Version 7.0.0-preview.7.22356.9 -> To Version 7.0.0-preview.7.22357.7 (parent: Microsoft.NET.Sdk
2022-07-08 17:53:18 +00:00