Commit graph

26699 commits

Author SHA1 Message Date
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
Marc Paine
7db81498f2
Merge pull request #15000 from dotnet/manodasanW-patch-4
[release/7.0.1xx] Update Windows SDK projection
2022-11-16 09:29:31 -08:00
Manodasan Wignarajah
0bce515541
Update Windows SDK projection 2022-11-15 18:25:59 -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
Jason Zhai
00572e1065 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-11-15 17:59:11 -08:00
DotNet Bot
f4db4d76fc Merged PR 27486: [internal/release/6.0.3xx] 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**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22561.4 (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.22561.4 (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.NETCore.Platforms**: from 6.0.7 to 6.0.7 (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.22564.30 (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.22564.30 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22564.30 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22564.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.307 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22523.5 to 6.0.307-servicing.22564.26 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.307 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5b...
2022-11-16 00:06:42 +00:00
DotNet-Bot
e47b02315a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221115.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.306-servicing.22523.22 -> To Version 6.0.307-servicing.22565.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.11 -> To Version 6.0.12 (parent: Microsoft.NET.Sdk
2022-11-15 18:16:09 +00:00
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
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
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
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-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
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
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