Commit graph

24435 commits

Author SHA1 Message Date
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
b11f5b701c 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.22558.7 -> To Version 6.0.0-beta.22561.1
2022-11-14 21:33:39 +00:00
dotnet-bot
5c86e04790 Merge in 'release/6.0.4xx' changes 2022-11-14 21:18:37 +00:00
dotnet-bot
0ddd5da6cf Merge in 'release/6.0.1xx' changes 2022-11-14 21:18:21 +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
b3add4e9b9 Update dependencies from https://github.com/dotnet/arcade build 20221110.1
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
2022-11-14 19:09:15 +00:00
dotnet-bot
1b7d8307a9 Merge in 'release/6.0.3xx' changes 2022-11-14 19:01:18 +00:00
dotnet-bot
777351864f Merge in 'release/6.0.4xx' changes 2022-11-14 19:00:55 +00:00
dotnet-bot
470da5d1dc Merge in 'release/6.0.1xx' changes 2022-11-14 19:00:14 +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
DotNet Bot
695a9165ff Merged PR 27430: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20221108.7
- **Date Produced**: November 9, 2022 12:33:13 AM UTC
- **Commit**: a7773a9828c67a9b1fba3d2daee061ec90db3505
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22463.7 to 6.0.0-beta.22558.7][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22463.7 to 6.0.0-beta.22558.7][1]
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22463.7 to 6.0.0-beta.22558.7][1]

[1]: 2fbe602...a7773a9

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.111

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2022-11-14 06:51:10 +00:00
DotNet-Bot
a37b944283 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.22463.7 -> To Version 6.0.0-beta.22558.7
2022-11-14 05:28:18 +00: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
86af062fc7 Merge in 'release/6.0.1xx' changes 2022-11-14 02:22:28 +00: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-bot
00659dc5a0 Merge in 'release/6.0.3xx' changes 2022-11-12 00:16:03 +00: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
dotnet-bot
b311caff48 Merge in 'release/6.0.1xx' changes 2022-11-11 22:56:10 +00:00
DotNet Bot
7b55235ec9 Merged PR 27019: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
This pull request updates the following dependencies

[marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e
- **Build**: 20221025.2
- **Date Produced**: October 25, 2022 4:23:07 PM UTC
- **Commit**: 132cb2b3b6a9fab06cc9ec3a3473366c58af4b37
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22513.1 to 6.0.0-servicing.22525.2][3]

[3]: 2477d38...132cb2b

[DependencyUpdate]: <> (End)

[marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
2022-11-11 22:52:25 +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
dotnet-bot
85607abd90 Merge in 'release/6.0.3xx' changes 2022-11-10 15:58:37 +00: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-bot
1b76f4c35f Merge in 'release/6.0.1xx' changes 2022-11-09 17:56:01 +00:00
dotnet-bot
9ba2c9b044 Merge in 'release/6.0.3xx' changes 2022-11-09 17:52:16 +00: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
NET Source-Build Bot
7bdf6a5ad4
update global.json and Versions.props for .NET SDK 6.0.111 (#14932) 2022-11-09 17:43:09 +00:00
Matt Mitchell
52360fe572
Merge pull request #14927 from vseanreesermsft/internal-merge-6.0.3xx-2022-11-08-1047
Merging internal commits for release/6.0.3xx
2022-11-09 09:42:15 -08:00