Commit graph

24019 commits

Author SHA1 Message Date
Steve
a3e88d2d6b
Fix invalid commit activity badge 2022-04-17 13:39:23 +08:00
Marc Paine
950db47a74
Merge pull request #13436 from kasperk81/patch-2
unset shell variables in single statement
2022-04-15 14:09:02 -07:00
v-wuzhai
735f60b925
Merge pull request #13647 from dotnet/darc-main-005b85ec-6cf2-4c41-a658-366cd8f83dea
[main] Update dependencies from dotnet/sdk
2022-04-14 23:39:09 -07:00
dotnet-maestro[bot]
79af2123b8 Update dependencies from https://github.com/dotnet/sdk build 20220414.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22214.13 -> To Version 7.0.100-preview.4.22214.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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk
 From Version 7.0.0-preview.4.22211.2 -> To Version 7.0.0-preview.4.22213.5 (parent: Microsoft.NET.Sdk
2022-04-15 05:25:45 +00:00
dotnet-maestro[bot]
f9831131f9 Update dependencies from https://github.com/dotnet/sdk build 20220414.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22214.13 -> To Version 7.0.100-preview.4.22214.19

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.3.0-preview-20220412-03 -> To Version 17.3.0-preview-20220414-01 (parent: Microsoft.NET.Sdk
2022-04-15 04:19:33 +00:00
v-wuzhai
9061d8cb6b
Merge pull request #13645 from dotnet/darc-main-663e8c3f-4f6a-47a4-9aaf-493bb619dc0e
[main] Update dependencies from dotnet/sdk
2022-04-14 19:25:02 -07:00
dotnet-maestro[bot]
ca909bf262 Update dependencies from https://github.com/dotnet/sdk build 20220414.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22214.12 -> To Version 7.0.100-preview.4.22214.13

Dependency coherency updates

Microsoft.Build
 From Version 17.3.0-preview-22212-02 -> To Version 17.3.0-preview-22213-05 (parent: Microsoft.NET.Sdk
2022-04-14 22:57:24 +00:00
Marc Paine
b21fb3782d
Merge pull request #13637 from dotnet/darc-main-e328a84d-ee21-418c-b074-06ed3b3461f0
[main] Update dependencies from dotnet/arcade
2022-04-14 14:27:33 -07:00
Marc Paine
f3db53ea02
Merge pull request #13636 from dotnet/darc-main-c59f0650-62fb-4a0a-9163-adb256d9a2a5
[main] Update dependencies from dotnet/sdk
2022-04-14 14:27:20 -07:00
dotnet-maestro[bot]
03a3b48717 Update dependencies from https://github.com/dotnet/sdk build 20220414.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22213.37 -> To Version 7.0.100-preview.4.22214.12

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,Microsoft.Build
 From Version 7.0.0-preview.4.22213.14 -> To Version 7.0.0-preview.4.22213.16 (parent: Microsoft.NET.Sdk
2022-04-14 19:00:31 +00:00
dotnet-maestro[bot]
9ce366f741 Update dependencies from https://github.com/dotnet/arcade build 20220413.2
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22212.2 -> To Version 7.0.0-beta.22213.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.22208.1 -> To Version 1.0.0-beta.22212.1 (parent: Microsoft.DotNet.Arcade.Sdk
2022-04-14 12:44:15 +00:00
dotnet-maestro[bot]
102dbd5628 Update dependencies from https://github.com/dotnet/sdk build 20220414.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22213.37 -> To Version 7.0.100-preview.4.22214.9

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,Microsoft.Build
 From Version 7.0.0-preview.4.22213.14 -> To Version 7.0.0-preview.4.22213.16 (parent: Microsoft.NET.Sdk
2022-04-14 11:09:24 +00:00
v-wuzhai
01f10dc6b2
Merge pull request #13634 from dotnet/darc-main-b7ccbc6d-2139-405d-bb1a-f8cbb857cecb
[main] Update dependencies from dotnet/sdk
2022-04-14 01:19:30 -07:00
dotnet-maestro[bot]
53c50dc1b2 Update dependencies from https://github.com/dotnet/sdk build 20220413.37
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22213.4 -> To Version 7.0.100-preview.4.22213.37

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.4.22212.5 -> To Version 7.0.0-preview.4.22213.14 (parent: Microsoft.NET.Sdk
2022-04-14 04:48:31 +00:00
dotnet-maestro[bot]
4ed37fe1d4 Update dependencies from https://github.com/dotnet/sdk build 20220413.36
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22213.4 -> To Version 7.0.100-preview.4.22213.36

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.4.22212.5 -> To Version 7.0.0-preview.4.22213.14 (parent: Microsoft.NET.Sdk
2022-04-14 03:24:02 +00:00
Marc Paine
425da3ecef
Merge pull request #13616 from dotnet/darc-main-df1ed6b4-2398-4949-9565-ffa5d5393d88
[main] Update dependencies from dotnet/arcade
2022-04-13 11:35:42 -07:00
Marc Paine
06dc97d835
Merge pull request #13606 from dotnet/darc-main-a3aca14b-b33f-417a-ba90-64c399326bfe
[main] Update dependencies from dotnet/sdk
2022-04-13 11:35:09 -07:00
Marc Paine
c8585fbba5
Merge pull request #13614 from manodasanW/patch-5
[main] Windows SDK projection update
2022-04-13 09:05:33 -07:00
dotnet-maestro[bot]
3c651ace62 Update dependencies from https://github.com/dotnet/sdk build 20220413.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22212.5 -> To Version 7.0.100-preview.4.22213.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.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22209.1 -> To Version 7.0.0-preview.4.22211.2 (parent: Microsoft.NET.Sdk
2022-04-13 15:58:47 +00:00
dotnet-maestro[bot]
0ced40ae15 Update dependencies from https://github.com/dotnet/arcade build 20220412.2
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22211.6 -> To Version 7.0.0-beta.22212.2
2022-04-13 12:49:05 +00:00
dotnet-maestro[bot]
d4e41876f6 Update dependencies from https://github.com/dotnet/sdk build 20220413.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22212.5 -> To Version 7.0.100-preview.4.22213.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-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22209.1 -> To Version 7.0.0-preview.4.22211.2 (parent: Microsoft.NET.Sdk
2022-04-13 10:46:41 +00:00
v-wuzhai
e59cb5e485
Merge pull request #13615 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-04-13 03:25:34 -07:00
Jason Zhai
9e95998988 Merge branch 'release/6.0.3xx' into main 2022-04-13 02:36:34 -07:00
v-wuzhai
319635a0eb
Merge pull request #13609 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-13 02:05:41 -07:00
Jason Zhai
abb75d6449 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-13 01:09:20 -07:00
dotnet-maestro[bot]
1a20f8d467 Update dependencies from https://github.com/dotnet/sdk build 20220412.32
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22212.5 -> To Version 7.0.100-preview.4.22212.32

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.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22209.1 -> To Version 7.0.0-preview.4.22211.2 (parent: Microsoft.NET.Sdk
2022-04-13 05:23:34 +00:00
dotnet-maestro[bot]
28eb9c350e Update dependencies from https://github.com/dotnet/sdk build 20220412.31
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22212.5 -> To Version 7.0.100-preview.4.22212.31

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-4.22211.2 -> To Version 4.2.0-4.22212.1 (parent: Microsoft.NET.Sdk
2022-04-13 03:42:07 +00:00
Manodasan Wignarajah
8b44b18635
Windows SDK projection update 2022-04-12 20:40:41 -07:00
v-wuzhai
8fd1aa5965
Merge pull request #13603 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-12 19:43:04 -07:00
v-wuzhai
39361a519d
Merge pull request #13596 from dotnet/darc-main-850735f9-2501-464a-8210-c61080495830
[main] Update dependencies from dotnet/arcade
2022-04-12 18:57:52 -07:00
v-wuzhai
7a786c2d80
Merge pull request #13597 from dotnet/darc-main-c8a9dddc-f6b4-4721-b1a4-dc91abc212b8
[main] Update dependencies from dotnet/test-templates
2022-04-12 18:56:57 -07:00
Jason Zhai
aec691922a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-12 18:53:50 -07:00
dotnet-maestro[bot]
3a3438a076 Update dependencies from https://github.com/dotnet/sdk build 20220412.29
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22212.5 -> To Version 7.0.100-preview.4.22212.29
2022-04-13 01:51:07 +00:00
v-wuzhai
314db6c4f5
Merge pull request #13587 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-04-12 17:55:02 -07:00
NET Source-Build Bot
8d32713c4e
update global.json and Versions.props for .NET SDK 6.0.104 (#13607) 2022-04-13 00:36:01 +00:00
Marc Paine
32eddb2738
Merge pull request #13594 from dotnet/darc-release/6.0.3xx-3b451efb-a515-4325-8d94-febe2965868c
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-12 14:56:17 -07:00
William Godbe
6bfbfe26a7
Update asp.net templates/downlevel runtimes (#13546)
* Update asp.net templates/downlevel runtimes

* Update GenerateBundledVersions.targets
2022-04-12 20:39:29 +00:00
William Godbe
f001fc0f1f
[6.0.3xx] Update asp.net template versions (#13545) 2022-04-12 20:37:09 +00:00
William Godbe
753cdcf45f
[6.0.2xx] Update asp.net template versions (#13544) 2022-04-12 20:30:37 +00:00
William Godbe
aca24a9b5a
[6.0.1xx] Update asp.net template versions (#13543) 2022-04-12 20:27:03 +00:00
dotnet-maestro[bot]
3e8b0d1b04 Update dependencies from https://github.com/dotnet/sdk build 20220412.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22212.5 -> To Version 7.0.100-preview.4.22212.6
2022-04-12 20:20:59 +00:00
Marc Paine
0870a9684a
Merge pull request #13534 from vseanreesermsft/branding-6.0.203-2022-04-05-1259
Update branding to 6.0.203
2022-04-12 12:04:42 -07:00
Marc Paine
608561c76d
Merge pull request #13533 from vseanreesermsft/branding-6.0.105-2022-04-05-1258
Update branding to 6.0.105
2022-04-12 12:04:31 -07:00
dotnet-maestro[bot]
87464f88ce
[main] Update dependencies from dotnet/sdk (#13595)
* Update dependencies from https://github.com/dotnet/sdk build 20220412.2

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22211.15 -> To Version 7.0.100-preview.4.22212.2

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-4.22208.7 -> To Version 4.2.0-4.22211.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220412.4

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22211.15 -> To Version 7.0.100-preview.4.22212.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-secrets,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-preview.4.22211.15 -> To Version 7.0.0-preview.4.22211.18 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220412.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22211.15 -> To Version 7.0.100-preview.4.22212.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-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-preview.4.22211.15 -> To Version 7.0.0-preview.4.22211.18 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-12 11:57:40 -07:00
dotnet-maestro[bot]
b5b2cf9efc Update dependencies from https://github.com/dotnet/test-templates build 20220412.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.22207.1 -> To Version 1.0.2-beta4.22212.1
2022-04-12 16:46:14 +00:00
MichaelSimons
c3accde0dc Remove aspnetcore source-build patch that was already backported 2022-04-12 14:24:18 +00:00
dotnet-maestro[bot]
4e50eb756d Update dependencies from https://github.com/dotnet/arcade build 20220411.6
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22206.10 -> To Version 7.0.0-beta.22211.6

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.22201.1 -> To Version 1.0.0-beta.22208.1 (parent: Microsoft.DotNet.Arcade.Sdk
2022-04-12 12:45:17 +00:00
dotnet-maestro[bot]
07b0deb73e Update dependencies from https://github.com/dotnet/sdk build 20220412.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22212.1 -> To Version 6.0.300-preview.22212.3

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-4.22208.7 -> To Version 4.2.0-4.22211.2 (parent: Microsoft.NET.Sdk
2022-04-12 10:21:01 +00:00
v-wuzhai
ff4f7f50e5
Merge pull request #13593 from dotnet/darc-release/6.0.3xx-963e9e8a-6b30-402e-96ad-89fb8bb7f440
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-12 03:02:17 -07:00
dotnet-maestro[bot]
4f10b352b0 Update dependencies from https://github.com/dotnet/sdk build 20220412.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22211.12 -> To Version 6.0.300-preview.22212.1
2022-04-12 09:14:44 +00:00