Commit graph

24102 commits

Author SHA1 Message Date
DotNet Bot
f7ab730194 Merged PR 27621: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22567.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.403 to 6.0.404 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.403-rtm.22523.6 to 6.0.404-rtm.22567.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.403 to 6.0.404 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22478.1 to 6.0.200-1.22553.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.3.1-3.22505.12 to 4.3.1-3.22526.13 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20221117.20
- **Date Produced**: November 17, 2022 10:16:52 PM UTC
- **Commit**: c816d3f1331a8e81e166d4543d81efbca0168a19
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.403-servicing.22523.23 to 6.0....
2022-11-18 18:20:53 +00:00
dotnet-bot
c5cca2c3f5 Merge in 'release/6.0.4xx' changes 2022-11-18 09:17:03 +00:00
v-wuzhai
811ce480e2
Merge pull request #15014 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-11-18 17:06:51 +08:00
Jason Zhai
28e0fa1f49 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-17 21:43:31 -08:00
v-wuzhai
3689844284
Merge pull request #15006 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-11-18 10:05:06 +08:00
Jason Zhai
1a10487fb7 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-16 18:14:12 -08:00
dotnet-bot
fc58d6196b Merge in 'release/6.0.4xx' changes 2022-11-16 17:52:59 +00:00
Marc Paine
ffe70b9829
Merge pull request #14997 from dotnet/manodasanW-patch-1
[release/6.0.1xx] Update Windows SDK projection
2022-11-16 09:29:57 -08:00
Marc Paine
0107d40dbf
Merge pull request #14998 from dotnet/manodasanW-patch-2
[release/6.0.3xx] Update Windows SDK projection
2022-11-16 09:29:51 -08:00
Marc Paine
6cb05d5e39
Merge pull request #14999 from dotnet/manodasanW-patch-3
[release/6.0.4xx] Update Windows SDK projection
2022-11-16 09:29:40 -08:00
Manodasan Wignarajah
030676c5c3
Update Windows SDK projection 2022-11-15 18:25:09 -08:00
Manodasan Wignarajah
1fca57de60
Update Windows SDK projection 2022-11-15 18:24:05 -08:00
Manodasan Wignarajah
0bc87ae443
Update Windows SDK projection 2022-11-15 18:22:56 -08:00
dotnet-bot
948450cd2b Merge in 'release/6.0.4xx' changes 2022-11-15 17:38:39 +00:00
Marc Paine
ac07b1a066
Merge pull request #14974 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-11-15 09:27:58 -08:00
Marc Paine
b34c736b0f
Merge pull request #14978 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-11-15 09:27:43 -08:00
Marc Paine
92455e57bb
Merge pull request #14989 from dotnet/darc-release/6.0.1xx-3abf24e0-34c5-472b-bc6b-c70ea35ada17
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-11-14 15:33:59 -08:00
dotnet-bot
6481ad0b25 Merge in 'release/6.0.4xx' changes 2022-11-14 22:44:38 +00:00
dotnet-maestro[bot]
f80515a196
Update dependencies from https://github.com/dotnet/arcade build 20221111.1 (#14990)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22560.1 -> To Version 6.0.0-beta.22561.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-11-14 14:33:43 -08:00
dotnet-bot
5c86e04790 Merge in 'release/6.0.4xx' changes 2022-11-14 21:18:37 +00:00
dotnet-maestro[bot]
4ee7cf8ded Update dependencies from https://github.com/dotnet/arcade build 20221111.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22560.1 -> To Version 6.0.0-beta.22561.1
2022-11-14 21:15:04 +00:00
dotnet-maestro[bot]
36953bd013
Update dependencies from https://github.com/dotnet/arcade build 20221110.1 (#14987)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-11-14 13:07:44 -08:00
dotnet-maestro[bot]
2db4ff9fc1
Update dependencies from https://github.com/dotnet/arcade build 20221110.1 (#14985)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22558.7 -> To Version 6.0.0-beta.22560.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-11-14 13:07:31 -08:00
dotnet-bot
777351864f Merge in 'release/6.0.4xx' changes 2022-11-14 19:00:55 +00:00
William Godbe
169bf3cc9d
Update asp.net templates (#14957) 2022-11-14 10:49:54 -08:00
William Godbe
364781dce5
Update asp.net templates (#14956) 2022-11-14 10:49:47 -08:00
William Godbe
86fd9340d4
Update asp.net templates (#14955) 2022-11-14 10:49:39 -08:00
Jason Zhai
f235f476f1 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-13 18:59:47 -08:00
Jason Zhai
7be65d9599 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-13 18:24:28 -08:00
dotnet-bot
d3ff91ca5b Merge in 'release/6.0.4xx' changes 2022-11-14 02:20:09 +00:00
v-wuzhai
6406fa35da
Merge pull request #14971 from dotnet/darc-release/6.0.1xx-47bfe37b-9286-4c1e-beef-524fd2b247d4
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-11-14 10:10:42 +08:00
v-wuzhai
53b4e90baf
Merge pull request #14972 from dotnet/darc-release/6.0.4xx-ba0b2508-0b5d-4da4-b150-98764c73f4ed
[release/6.0.4xx] Update dependencies from dotnet/arcade
2022-11-14 10:10:06 +08:00
v-wuzhai
83368e2387
Merge pull request #14973 from dotnet/darc-release/6.0.4xx-c258d986-348f-498f-9c43-16ec90a01a94
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-11-14 10:08:36 +08:00
dotnet-maestro[bot]
cf00abac69 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221025.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22464.1 -> To Version 6.0.0-servicing.22525.2
2022-11-12 00:06:00 +00:00
dotnet-maestro[bot]
b48e4150de Update dependencies from https://github.com/dotnet/arcade build 20221108.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7
2022-11-12 00:05:41 +00:00
Marc Paine
9b1077847c
Merge pull request #14969 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-11-11 16:03:48 -08:00
dotnet-maestro[bot]
3d646e4314 Update dependencies from https://github.com/dotnet/arcade build 20221108.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22558.2 -> To Version 6.0.0-beta.22558.7
2022-11-11 23:50:58 +00:00
dotnet-bot
3e3cbe94e7 Merge in 'release/6.0.4xx' changes 2022-11-11 22:59:13 +00:00
Marc Paine
6b880c7f86
Merge pull request #14954 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-11-11 14:48:51 -08:00
Marc Paine
cdbf966982
Merge pull request #14789 from dotnet/marcpopMSFT-disabletest
Disable some tests that are failing because of a nuget issue on linux
2022-11-11 14:45:40 -08:00
Jason Zhai
ac4026589a Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-10 21:53:16 -08:00
Michael Simons
3cc6b7a3d4
Merge pull request #14942 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-11-10 09:47:32 -06:00
dotnet-bot
2822bfa53b Merge in 'release/6.0.4xx' changes 2022-11-10 09:54:05 +00:00
v-wuzhai
c99c40e8de
Merge pull request #14947 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-11-10 17:39:44 +08:00
Jason Zhai
fa25dc817a Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-10 00:29:39 -08:00
Jason Zhai
0a039f3a4d Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-09 22:41:11 -08:00
dotnet-bot
a6afcac284 Merge in 'release/6.0.4xx' changes 2022-11-09 18:33:00 +00:00
Matt Mitchell
66d4830b85
Merge pull request #14928 from vseanreesermsft/internal-merge-6.0.4xx-2022-11-08-1048
Merging internal commits for release/6.0.4xx
2022-11-09 10:22:26 -08:00
dotnet-maestro[bot]
5e29b02b24
[release/6.0.1xx] Update dependencies from dotnet/arcade (#14934)
* Update dependencies from https://github.com/dotnet/arcade build 20221108.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2

* Update SourceBuild.Tasks.csproj tfm

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-11-09 09:50:55 -08:00
Matt Mitchell
a7d35ee84f
Merge branch 'release/6.0.4xx' into internal-merge-6.0.4xx-2022-11-08-1048 2022-11-09 09:43:20 -08:00