dotnet-bot
948450cd2b
Merge in 'release/6.0.4xx' changes
2022-11-15 17:38:39 +00:00
dotnet-bot
a9e8d17448
Merge in 'release/6.0.3xx' changes
2022-11-15 17:37:59 +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
DotNet Bot
c28f40fee6
Merged PR 27157: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
...
This pull request updates the following dependencies
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221104.17
- **Date Produced**: November 4, 2022 11:18:30 PM UTC
- **Commit**: d3b397b549f33e0a9d110d66d13df7d0f9ef0a9f
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.21 to 6.0.112-servicing.22554.17][4]
- **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.21 to 6.0.112-servicing.22554.17][4]
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f6e48c&targetVersion=GCd3b397b&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-11-15 17:15:46 +00:00
dotnet-bot
5b47ff93bc
Merge in 'release/7.0.1xx' changes
2022-11-15 16:28:42 +00:00
Tom Deseyn
d62cd319ad
Enabled source-building with mono runtime on any architecture. ( #14792 )
...
* Enabled source-building with mono runtime on any architecture.
Adds an argument to the top-level build script to use the mono
runtime, and sets the flags needed for the different repos
to work with mono.
* Sync with sdk patch.
* Remove patches.
* PR feedback.
2022-11-15 16:17:10 +00:00
Chris Rummel
5da0082f52
Merge remote-tracking branch 'vso-internal/internal/release/6.0.1xx' into darc-internal/release/6.0.1xx-78f52533-7623-4f87-89ff-cd7b5e833c34
2022-11-14 23:22:56 -06:00
DotNet-Bot
f132866e03
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221104.17
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.111-servicing.22523.21 -> To Version 6.0.112-servicing.22554.17
2022-11-15 04:58:16 +00:00
dotnet-bot
6c63c835e5
Merge in 'release/7.0.1xx' changes
2022-11-15 03:12:40 +00:00
Chris Rummel
46a7f72ac9
Merge pull request #14647 from tmds/bundled_portable_rid
...
BundledVersions: update portable rid logic.
2022-11-14 21:01:29 -06:00
dotnet-bot
06b4e03ef8
Merge in 'release/7.0.1xx' changes
2022-11-15 01:55:07 +00:00
v-wuzhai
0be2e47428
Merge pull request #14970 from dotnet-maestro-bot/merge/release/6.0.4xx-to-release/7.0.1xx
...
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'
2022-11-15 09:44:32 +08:00
Matt Mitchell
f5c57b8ad1
Merged PR 27450: Merge from public
...
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
2022-11-15 01:00:36 +00:00
DotNet Bot
b64694672f
Merged PR 27445: [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**: 20221111.1
- **Date Produced**: November 11, 2022 6:08:35 PM UTC
- **Commit**: 0967701e5527a1be21d9473821077c3f4be7f9dc
- **Branch**: refs/heads/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22558.7 to 6.0.0-beta.22561.1][2]
- **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22558.7 to 6.0.0-beta.22561.1][2]
- **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22558.7 to 6.0.0-beta.22561.1][2]
[2]: a7773a9...0967701
[DependencyUpdate]: <> (End)
[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2022-11-15 01:00:14 +00:00
dotnet-bot
a58a169c44
Merge in 'release/6.0.1xx' changes
2022-11-14 23:46:16 +00: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
Matt Mitchell
2a360fdedb
Merge remote-tracking branch 'upstream/release/7.0.1xx' into merge-internal/release/7.0.1xx
2022-11-14 14:32:16 -08:00
Matt Mitchell
08fdc56599
Merged PR 27437: Merge from public
2022-11-14 22:22:01 +00: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-maestro[bot]
8bfe390861
Update dependencies from https://github.com/dotnet/arcade build 20221111.2 ( #14983 )
...
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-11-14 13:05:10 -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
d247125c79
Update asp.net templates ( #14958 )
2022-11-14 10:50:01 -08: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
Matt Mitchell
0b947205d5
Merge remote-tracking branch 'upstream/release/7.0.1xx' into merge-internal/release/7.0.1xx
2022-11-14 09:56:42 -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
Jason Zhai
c2db622a6b
Merge branch 'release/6.0.4xx' into release/7.0.1xx
2022-11-13 21:43:19 -08: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
cbfa597305
Merge pull request #14941 from dotnet/darc-release/7.0.1xx-24002a16-433a-4cde-8fb5-72309a253902
...
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-11-14 10:11:22 +08: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
Matt Mitchell
ea69494641
Fix missing cross-genning ( #14967 )
...
* Fix missing cross-genning
Cross-genning got missed because the paths were hardcoded. Instead, use properties and a "default TFM". Also introduce checking to ensure that we don't miss cross-genning in common cases.
* Don't error when no WD found
2022-11-12 09:00:12 -08:00
Michael Simons
982c0c3fab
Merge branch 'release/7.0.1xx' into darc-release/7.0.1xx-24002a16-433a-4cde-8fb5-72309a253902
2022-11-11 18:22:56 -06:00