Commit graph

28157 commits

Author SHA1 Message Date
Marc Paine
03c15d0900
Merge pull request #14981 from dotnet-maestro-bot/merge/release/7.0.2xx-to-main
[automated] Merge branch 'release/7.0.2xx' => 'main'
2022-11-15 09:26:21 -08:00
Marc Paine
c78b0f37fd The mono manifests are 7.0.0 so updating to the final emsdk version as well. 2022-11-15 09:25:12 -08:00
Přemek Vysoký
0fd4b2d927
Add root .gitignore for the VMR (#14992) 2022-11-15 17:08:53 +00:00
Tom Deseyn
a8dcd1e504
source-build: stop overriding aspnetcore version (#14938)
* Rename MicrosoftAspNetCoreAppRuntimePackageVersion so existing Artifacts tarballs don't override it,
and stop adding it to the PackageVersions.props in new Artifacts tarballs.

* Patch PreviouslySourceBuiltPackageVersions.

* PR feedback.
2022-11-15 10:51:15 -06:00
MichaelSimons
4bca1bc267 Source-build fixups 2022-11-15 16:47:48 +00:00
dotnet-bot
5b47ff93bc Merge in 'release/7.0.1xx' changes 2022-11-15 16:28:42 +00:00
MichaelSimons
a1525e5c10 Add aspnetcore patch to workaround roslyn-analyzers issue 2022-11-15 16:21:26 +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
MichaelSimons
53540cb871 Update source-build version.details.xml metadata 2022-11-15 15:27:29 +00:00
MichaelSimons
7ef132ab4b Fixup source-build incorrect merges 2022-11-15 15:12:30 +00:00
MichaelSimons
d94a507e4d Merge branch 'release/7.0.2xx' of https://github.com/dotnet/installer into darc-release/7.0.2xx-7e69b665-5c91-460f-8c3b-ead1cb297759 2022-11-15 14:56:06 +00:00
Michael Simons
a4af3c9956
Remove RepoRoot normalization workaround (#14988) 2022-11-15 08:49:39 -06:00
dotnet-maestro[bot]
07c5dda4d3 Update dependencies from https://github.com/dotnet/sdk build 20221115.3
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100 -> To Version 8.0.100
2022-11-15 14:45:26 +00:00
dotnet-maestro[bot]
108b2a9686 Update dependencies from https://github.com/dotnet/sdk build 20221115.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100 -> To Version 8.0.100
2022-11-15 13:33:12 +00:00
dotnet-maestro[bot]
a6cc83b1a3 Update dependencies from https://github.com/dotnet/sdk build 20221114.32
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200

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.NETCore.Platforms,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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,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.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
2022-11-15 08:03:35 +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-maestro[bot]
7d84144806 Update dependencies from https://github.com/dotnet/sdk build 20221114.18
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200

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.NETCore.Platforms,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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,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.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
2022-11-15 02:27:22 +00: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
842daf4f9e Merge branch 'merge/release/7.0.1xx-to-release/7.0.2xx' of https://github.com/dotnet-maestro-bot/core-sdk into merge/release/7.0.1xx-to-release/7.0.2xx 2022-11-14 15:40:27 -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
Marc Paine
e6e579fa0c
Merge pull request #14984 from dotnet/darc-main-994a087e-4721-4944-9dd2-937334774e69
[main] Update dependencies from dotnet/sdk
2022-11-14 15:33:36 -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-maestro[bot]
d652240961
Update dependencies from https://github.com/dotnet/arcade build 20221111.2 (#14982)
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 14:20:29 -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-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
Marc Paine
c28a988320
Merge pull request #14961 from dotnet/marcpopMSFT-updatetortm
Switch to the rtm release version for all 7.0 assets
2022-11-14 13:13:27 -08: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-maestro[bot]
cae0806c99 Update dependencies from https://github.com/dotnet/sdk build 20221114.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100 -> To Version 8.0.100

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build
 From Version 12.5.0-beta.22559.7 -> To Version 12.5.0-beta.22563.3 (parent: Microsoft.NET.Sdk
2022-11-14 20:08:32 +00:00
Marc Paine
eb8b527193
Merge branch 'main' into marcpopMSFT-updatetortm 2022-11-14 12:00:15 -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
MichaelSimons
9bb3d0719e source-build fixup - patch should not flow as it was backported in main 2022-11-14 18:52:43 +00:00
William Godbe
0cf340bebe
Update asp.net templates (#14959) 2022-11-14 10:50:10 -08: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
MichaelSimons
3d3758449b Merge branch 'main' of https://github.com/dotnet/installer into merge/release/7.0.2xx-to-main 2022-11-14 18:49:54 +00: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-maestro[bot]
76db3552d9 Update dependencies from https://github.com/dotnet/sdk build 20221114.7
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100 -> To Version 8.0.100

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 12.5.0-beta.22559.7 -> To Version 12.5.0-beta.22563.3 (parent: Microsoft.NET.Sdk
2022-11-14 18:46:49 +00:00