Commit graph

26699 commits

Author SHA1 Message Date
dotnet-bot
9b07fdcbec Merge in 'release/7.0.1xx' changes 2023-01-20 22:07:23 +00:00
Michael Simons
de87c6c89c
remove unnecessary nowarn from source-build SBRP project (#15302) 2023-01-20 15:55:36 -06:00
dotnet-bot
a1e12623d6 Merge in 'release/7.0.1xx' changes 2023-01-20 18:35:25 +00:00
Michael Simons
b743cc9964 Revert "Update smoke-tests to target net8"
This reverts commit 9dfa832bb9.
2023-01-20 18:24:00 +00:00
DotNet Bot
4f60ac0054 Merged PR 28383: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230120.4
- **Date Produced**: January 20, 2023 12:57:52 PM UTC
- **Commit**: 4b23d8b7b6c461e8af1b8a06e4d3a5ed7879c409
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.102 to 7.0.103][86]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.102-servicing.22607.4 to 7.0.103-servicing.23070.4][86]
  - **Microsoft.NET.Sdk**: [from 7.0.102-servicing.22607.4 to 7.0.103-servicing.23070.4][86]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.102-servicing.22607.4 to 7.0.103-servicing.23070.4][86]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.2 to 7.0.3][87]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22607.1 to 7.0.3-servicing.23061.3][87]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.2-servicing.22607.1 to 7.0.3-servicing.23061.3][87]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.2 to 7.0.3][88]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.2-servicing.22606.5 to 7.0.3-servicing.23067.8][88]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.2 to 7.0.3][88]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.2 to 7.0.3][88]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.2 to 7.0.3][88]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.2 to 7.0.3][89]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.2-servicing.22606.6 to 7.0.3-servicing.23062.18][89]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.2 to 7.0.3][89]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22606.6 to 7.0.3-servicing.23062.18][89]
  - **dotnet-dev-certs**: [from 7.0.2-servicing.22606.6 to 7.0.3-servicing.23062.18][89]
  - **dotnet-user-jwts**: [from 7.0.2-servicing.22606.6 to 7.0.3-servicing.23062.18][89]
  - **dotnet-user-secrets**: [from 7.0.2-servicing.22606.6 to 7.0.3-servicing.23062.18][89]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.2 to 7.0.3][87]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.2 to 7.0.3][87]
  - **Microsoft.NET.ILLink.Tasks**: [from 7.0.100-1.22579.2 to 7.0.100-1.23062.2][90]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.4.0-6.22580.4 to 4.4.0-6.23068.5][91]
  - **Microsoft.Build**: [from 17.4.1 to 17.4.1][92]
  - **NuGet.Build.Tasks**: [from 6.4.0-rc.117 to 6.4.0-rc.123][93]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22606.5 to 7.0.3-servicing.23067.8][88]
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.2 to 7.0.3][94]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22606.5 to ...
2023-01-20 18:22:02 +00:00
dotnet-bot
146923bb17 Merge in 'release/7.0.1xx' changes 2023-01-20 18:17:25 +00:00
Michael Simons
9dfa832bb9 Update smoke-tests to target net8 2023-01-20 18:05:42 +00:00
DotNet-Bot
1cdf9e8b89 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230120.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk
2023-01-20 13:24:36 +00:00
DotNet-Bot
364f2acbc7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.17
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk
2023-01-19 23:31:25 +00:00
Marc Paine
f781997131 Merge remote-tracking branch 'ADO/internal/release/7.0.1xx' into darc-internal/release/7.0.1xx-238d0f85-c8b5-41fe-aac2-58efc64a4faf 2023-01-19 14:23:47 -08:00
DotNet-Bot
4ef4ac737a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk
2023-01-19 18:50:25 +00:00
Chris Rummel
964229ad77
This issue appears to have been resolved, patch is conflicting. 2023-01-18 10:13:34 -06:00
DotNet-Bot
c25343453c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.32
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk
2023-01-18 07:04:11 +00:00
DotNet-Bot
15d6321061 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.14
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.2 -> To Version 7.0.3 (parent: Microsoft.NET.Sdk
2023-01-18 00:37:20 +00:00
dotnet-bot
efc9e12bec Merge in 'release/7.0.1xx' changes 2023-01-17 23:23:38 +00:00
Marc Paine
33d44bcd22
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#15281) 2023-01-17 15:12:47 -08:00
dotnet-bot
9f26f658a9 Merge in 'release/7.0.1xx' changes 2023-01-17 23:04:24 +00:00
NET Source-Build Bot
4192499940
.NET Source-Build 7.0.102 January 2023 Updates (#15251)
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-01-17 16:52:01 -06:00
DotNet-Bot
e9b4726e0c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230115.7
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-16 08:14:49 +00:00
DotNet-Bot
75c31204d8 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230115.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-16 04:35:11 +00:00
dotnet-maestro[bot]
067f0fc228 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230113.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22608.2 -> To Version 7.0.0-alpha.1.23063.1
2023-01-14 00:45:09 +00:00
dotnet-bot
cf182aacb2 Merge in 'release/7.0.1xx' changes 2023-01-13 20:24:26 +00:00
Chris Rummel
4a2d55e922
[release/7.0.1xx] repos/sdk.proj: set NativeAotSupported=false on arm platform (#15039) 2023-01-13 14:12:34 -06:00
DotNet-Bot
db04b8f9f4 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230113.11
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-13 18:36:08 +00:00
DotNet-Bot
2540b41dc9 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.33
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-13 08:28:03 +00:00
DotNet-Bot
8533df67ae Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.31
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-13 07:01:02 +00:00
DotNet-Bot
060487b8e5 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.23
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-13 05:17:16 +00:00
dotnet-bot
b0d8dce013 Merge in 'release/7.0.1xx' changes 2023-01-13 00:42:11 +00:00
Marc Paine
1e15b09a1d
Merging internal commits for release/7.0.1xx (#15239) 2023-01-12 16:28:56 -08:00
dotnet-bot
b659291a4e Merge in 'release/7.0.1xx' changes 2023-01-12 21:40:12 +00:00
Marc Paine
e9d1c4b473
[release/7.0.1xx] Update dependencies from dotnet/arcade (#15262) 2023-01-12 13:37:14 -08:00
Marc Paine
aa9c968b3c
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15264) 2023-01-12 13:36:32 -08:00
Marc Paine
f379ff0db7
[7.0.1xx] Update Asp.Net templates (#15247) 2023-01-12 13:29:23 -08:00
DotNet-Bot
dc4e6b95b0 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230112.7
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 7.0.100-1.22579.2 -> To Version 7.0.100-1.23062.2 (parent: Microsoft.NET.Sdk
2023-01-12 19:27:56 +00:00
Jason Zhai
c23d4aa142 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-01-11 22:01:14 -08:00
DotNet-Bot
1505b38f4f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.34
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk
2023-01-12 03:00:36 +00:00
DotNet-Bot
d9f24b7ea5 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.26
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk
2023-01-11 23:29:37 +00:00
dotnet-maestro[bot]
c66a9c4496
[release/6.0.4xx] Update dependencies from dotnet/arcade (#15261)
[release/6.0.4xx] Update dependencies from dotnet/arcade
2023-01-11 22:22:05 +00:00
dotnet-maestro[bot]
e348545cae Update dependencies from https://github.com/dotnet/arcade build 20230110.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22561.2 -> To Version 7.0.0-beta.23060.4
2023-01-11 19:23:37 +00:00
v-wuzhai
cdcd5bab1f
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15242) 2023-01-11 02:04:59 -08:00
Jason Zhai
fe5b067226 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-01-10 22:32:32 -08:00
William Godbe
7c2e144469
[6.0.4xx] Update asp.net templates (#15244) 2023-01-10 15:43:16 -08:00
William Godbe
ba627450f8
[6.0.3xx] Update Asp.Net templates (#15246) 2023-01-10 15:42:58 -08:00
William Godbe
9cd784cdbf
[7.0.1xx] Update Asp.Net templates 2023-01-10 14:11:27 -08:00
Marc Paine
40cd09ee52
Merging internal commits for release/6.0.3xx (#15237) 2023-01-10 13:27:31 -08:00
Marc Paine
4beb82d928
Merging internal commits for release/6.0.4xx (#15238) 2023-01-10 13:27:18 -08:00
Sean Reeser
28c9a4c2e7 Merge commit '4bbdd14480a177e60fba52abf34829020449e46e' into internal-merge-7.0.1xx-2023-01-10-1111 2023-01-10 11:11:44 -08:00
Sean Reeser
56bcc639e4 Merge commit '27ab36058b70b2e05063911df631fbf17f954a35' into internal-merge-6.0.4xx-2023-01-10-1108 2023-01-10 11:08:06 -08:00
Sean Reeser
d2ec709d0d Merge commit 'c61979521a4c6136fac9fa4d60f227c7971c6042' into internal-merge-6.0.3xx-2023-01-10-1107 2023-01-10 11:07:58 -08:00
DotNet-Bot
070988e6b9 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.14
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.102 -> To Version 7.0.103

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 4.4.0-6.22580.4 -> To Version 4.4.0-6.22615.3 (parent: Microsoft.NET.Sdk
2023-01-09 20:26:54 +00:00