Commit graph

23710 commits

Author SHA1 Message Date
DotNet Bot
02d5242ed7 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Resolve source-build patch conflicts

 - Remove source-build runtime patch that was backported

 - Merge branch 'internal/release/6.0.1xx' of https://dnceng.visualstudio.com/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679

 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9

 - Download bits from dotnetbuilds/internal

 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9

 - Merge remote-tracking branch 'dnceng/internal/release/6.0.1xx' into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679
2022-01-19 18:34:20 +00:00
Jacques Eloff
1c933031f5 Workloads: Support for SxS previews 2022-01-19 09:17:41 -08:00
dotnet-maestro[bot]
bd23499dc1 Update dependencies from https://github.com/dotnet/sdk build 20220119.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22069.4

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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22069.1 (parent: Microsoft.NET.Sdk
2022-01-19 17:00:50 +00:00
dotnet-bot
df2d0d6a9b Merge in 'release/6.0.1xx' changes 2022-01-19 16:59:44 +00:00
dotnet-maestro[bot]
ebc698ea6b
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.2 (#13086)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-19 16:58:31 +00:00
dotnet-maestro[bot]
c2f2dbdde2 Update dependencies from https://github.com/dotnet/sdk build 20220119.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22069.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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22069.1 (parent: Microsoft.NET.Sdk
2022-01-19 16:17:48 +00:00
dotnet-bot
7736c8aefa Merge in 'release/6.0.1xx' changes 2022-01-19 15:08:02 +00:00
dotnet-maestro[bot]
401e3968d7
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.1 (#13084)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-19 15:06:19 +00:00
dotnet-maestro[bot]
c90f7a2280
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.1 (#13083)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-19 15:01:14 +00:00
dotnet-maestro[bot]
877ae87f93
Update dependencies from https://github.com/dotnet/arcade build 20220118.3 (#13082)
[main] Update dependencies from dotnet/arcade
2022-01-19 14:36:25 +00:00
dotnet-bot
59e84cbf61 Merge in 'release/6.0.1xx' changes 2022-01-19 13:48:49 +00:00
Michael Simons
a22825a1ff
Add runtime and aspnetcore patches to always build libs, app.ref and targetting packs (#13009)
* Add runtime patch to build all packages during source-build

* Add aspnetcore patch to always build App.Ref and targeting packs
2022-01-19 07:47:28 -06:00
dotnet-maestro[bot]
aa25a1f5b4 Update dependencies from https://github.com/dotnet/sdk build 20220119.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22069.1

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-19 13:32:34 +00:00
v-wuzhai
563dd65598
Merge pull request #13075 from dotnet-maestro-bot/merge/release/6.0.2xx-to-main
[automated] Merge branch 'release/6.0.2xx' => 'main'
2022-01-19 02:07:38 -08:00
dotnet-maestro[bot]
1a868310fc Update dependencies from https://github.com/dotnet/sdk build 20220118.27
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.27

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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-19 08:34:28 +00:00
dotnet-maestro[bot]
bd82fb0361 Update dependencies from https://github.com/dotnet/sdk build 20220118.26
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22068.26

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-19 08:30:11 +00:00
dotnet-maestro[bot]
22424ecdb7 Update dependencies from https://github.com/dotnet/sdk build 20220118.25
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-19 06:21:50 +00:00
dotnet-bot
a079542a92 Merge in 'release/6.0.1xx' changes 2022-01-19 05:49:14 +00:00
Matt Mitchell
9092e6a3c4
Merge pull request #13077 from MichaelSimons/internal-clone
Add additional clause in ConvertInternalRepos condition
2022-01-18 21:47:56 -08:00
dotnet-maestro[bot]
240a48d0ad Update dependencies from https://github.com/dotnet/sdk build 20220118.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.24

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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-19 05:07:47 +00:00
dotnet-maestro[bot]
c2a9fb9753 Update dependencies from https://github.com/dotnet/sdk build 20220118.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.23

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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-19 03:13:21 +00:00
Marc Paine
555fc2a5f1 Force an explicit package reference to a newer version of system.net.http 2022-01-18 16:51:54 -08:00
MichaelSimons
5846bfe682 Add additional clause in ConvertInternalRepos condition 2022-01-19 00:42:46 +00:00
dotnet-maestro[bot]
891d4fd52b Update dependencies from https://github.com/dotnet/sdk build 20220118.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 23:28:53 +00:00
dotnet-maestro[bot]
ec5fe6dae6 Update dependencies from https://github.com/dotnet/sdk build 20220118.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 22:16:13 +00:00
Marc Paine
3023667922
Merge branch 'main' into merge/release/6.0.2xx-to-main 2022-01-18 13:24:48 -08:00
Marc Paine
20654c1908
Merge pull request #12976 from dotnet/marcpopMSFT-net7.0strings
Update all of the loc strings for net7.0
2022-01-18 13:22:21 -08:00
dotnet-maestro[bot]
09139e37ec Update dependencies from https://github.com/dotnet/sdk build 20220118.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 20:42:53 +00:00
dotnet-maestro[bot]
02e787d300 Update dependencies from https://github.com/dotnet/sdk build 20220118.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.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-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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 19:41:54 +00:00
dotnet-maestro[bot]
f986b405bd Update dependencies from https://github.com/dotnet/sdk build 20220118.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 18:39:30 +00:00
dotnet-maestro[bot]
652e207419 Update dependencies from https://github.com/dotnet/sdk build 20220118.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 18:05:59 +00:00
Marc Paine
41ae4ef8f2
Merge pull request #13036 from dotnet/marcpopMSFT-merge601xx
Update 6.0.2xx to current 6.0.102 changes
2022-01-18 09:39:40 -08:00
dotnet-maestro[bot]
0956ea6cb2
[main] Update dependencies from dotnet/arcade (#13058)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22057.1 to 1.0.0-beta.22065.1 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Remove source-build arcade patches that were backported
2022-01-18 16:55:59 +00:00
dotnet-maestro[bot]
eec5314dea Update dependencies from https://github.com/dotnet/sdk build 20220118.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.3 (parent: Microsoft.NET.Sdk
2022-01-18 16:29:18 +00:00
dotnet-maestro[bot]
b9baa67a41 Update dependencies from https://github.com/dotnet/sdk build 20220118.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.5

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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk
2022-01-18 15:40:56 +00:00
dotnet-maestro[bot]
e60226860b Update dependencies from https://github.com/dotnet/sdk build 20220118.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-alpha.1.22068.1 -> To Version 7.0.100-alpha.1.22068.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-alpha.1.22065.2 -> To Version 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk
2022-01-18 10:08:47 +00:00
dotnet-maestro[bot]
4178bd9f4a
Update dependencies from https://github.com/dotnet/sdk build 20220118.1 (#13072)
[main] Update dependencies from dotnet/sdk
2022-01-18 10:07:46 +00:00
dotnet-maestro[bot]
8d5acd3dfa
Update dependencies from https://github.com/dotnet/sdk build 20220117.6 (#13071)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.22067.1 to 7.0.0-alpha.1.22067.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.22067.1 to 7.0.0-alpha.1.22067.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22067.1 to 7.0.0-alpha.1.22067.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22067.1 to 7.0.0-alpha.1.22067.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.22067.1 to 7.0.0-alpha.1.22067.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.22067.1 to 7.0.0-alpha.1.22067.2 (parent: Microsoft.NET.Sdk)
2022-01-18 09:09:44 +00:00
dotnet-maestro[bot]
c5a7b17708
Update dependencies from https://github.com/dotnet/sdk build 20220117.5 (#13070)
[main] Update dependencies from dotnet/sdk
2022-01-18 06:53:50 +00:00
dotnet-maestro[bot]
3304cba095
Update dependencies from https://github.com/dotnet/sdk build 20220117.3 (#13069)
[main] Update dependencies from dotnet/sdk
2022-01-18 05:08:53 +00:00
dotnet-maestro[bot]
8cd050c01b Update dependencies from https://github.com/dotnet/sdk build 20220117.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22067.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-preview.21623.5 -> To Version 6.0.200-preview.22062.10 (parent: Microsoft.NET.Sdk
2022-01-18 04:57:27 +00:00
dotnet-maestro[bot]
068dd8e64e
Update dependencies from https://github.com/dotnet/sdk build 20220117.2 (#13068)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.22066.1 to 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.22066.1 to 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22066.1 to 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22066.1 to 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.22066.1 to 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.22066.1 to 7.0.0-alpha.1.22067.1 (parent: Microsoft.NET.Sdk)
2022-01-17 21:29:11 +00:00
Alexander Köplinger
ee7e6073f4 Revert "Resolve msbuild source-build patch conflict"
This reverts commit 4b41693115.

We need the previous version after https://github.com/dotnet/sdk/pull/23421 was merged which downgraded msbuild back to the correct version.
2022-01-17 19:11:04 +01:00
dotnet-maestro[bot]
1f009a02ad
Update dependencies from https://github.com/dotnet/sdk build 20220117.1 (#13067)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22065.6 to 7.0.0-alpha.1.22066.4 (parent: Microsoft.NET.Sdk)
2022-01-17 17:35:52 +00:00
dotnet-maestro[bot]
f5c4dd6e36
Update dependencies from https://github.com/dotnet/test-templates build 20220117.2 (#13066)
[main] Update dependencies from dotnet/test-templates
2022-01-17 17:07:20 +00:00
dotnet-maestro[bot]
c2a24c0aea
Update dependencies from https://github.com/dotnet/test-templates build 20220117.1 (#13065)
[main] Update dependencies from dotnet/test-templates
2022-01-17 10:02:15 +00:00
dotnet-maestro[bot]
2caad98c1b
Update dependencies from https://github.com/dotnet/sdk build 20220116.4 (#13064)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.22064.2 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22064.2 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.22064.2 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.22064.2 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.22064.2 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.22064.3 to 7.0.0-alpha.1.22065.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2022-01-17 09:18:42 +00:00
dotnet-maestro[bot]
ed1f5d99a0
Update dependencies from https://github.com/dotnet/sdk build 20220116.3 (#13063)
[main] Update dependencies from dotnet/sdk
2022-01-17 08:10:52 +00:00
dotnet-maestro[bot]
95c5f63276
Update dependencies from https://github.com/dotnet/sdk build 20220116.2 (#13062)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.22065.2 to 7.0.0-alpha.1.22066.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.22065.2 to 7.0.0-alpha.1.22066.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22065.2 to 7.0.0-alpha.1.22066.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22065.2 to 7.0.0-alpha.1.22066.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.22065.2 to 7.0.0-alpha.1.22066.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.22065.2 to 7.0.0-alpha.1.22066.1 (parent: Microsoft.NET.Sdk)
2022-01-17 05:54:56 +00:00
dotnet-maestro[bot]
d85242a780
[main] Update dependencies from dotnet/sdk (#13061)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.22064.13 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.22064.13 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22064.13 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22064.13 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.22064.13 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.22064.13 to 7.0.0-alpha.1.22065.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22063.12 to 7.0.0-alpha.1.22065.6 (parent: Microsoft.NET.Sdk)
2022-01-16 16:13:37 +00:00