Commit graph

26533 commits

Author SHA1 Message Date
v-wuzhai
1c38151cab
Merge pull request #14502 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-09-14 23:59:02 -07:00
Jason Zhai
f6029750a6 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-09-14 19:25:04 -07:00
Marc Paine
44384ec703
RTM Branding 2022-09-14 17:03:25 -07:00
dotnet-bot
ca577853db Merge in 'release/7.0.1xx' changes 2022-09-14 23:33:12 +00:00
Logan Bussell
32aa619da0
Source-build updates from .NET 7.0.0-rc1 September 2022 release (#14500) 2022-09-14 23:22:08 +00:00
dotnet-bot
2fd6a1cad7 Merge in 'release/6.0.1xx' changes 2022-09-14 21:48:28 +00:00
dotnet-bot
9b9de1068e Merge in 'release/6.0.4xx' changes 2022-09-14 21:47:48 +00:00
Matt Mitchell
437a3088ea
Merge branch 'release/6.0.3xx' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-14 14:45:49 -07:00
Matt Mitchell
ed966db67a
Merge pull request #14497 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-09-14 14:44:54 -07:00
Matt Mitchell
b5f732e4b5
Merge pull request #14481 from vseanreesermsft/internal-merge-6.0.1xx-2022-09-13-1003
Merging internal commits for release/6.0.1xx
2022-09-14 14:38:45 -07:00
dotnet-maestro[bot]
934d6b31df
Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14498)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-14 14:36:42 -07:00
dotnet-maestro[bot]
5364e129c0
Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14499)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-14 14:36:17 -07:00
dotnet-bot
fc2dc63009 Merge in 'release/7.0.1xx' changes 2022-09-14 20:04:05 +00:00
Nikola Milosavljevic
febbee2dc4
Merge pull request #14484 from NikolaMilosavljevic/roslyn.patch
Remove roslyn Microsoft.CodeAnalysis.Common patch
2022-09-14 12:52:41 -07:00
dotnet-bot
400e3fe191 Merge in 'release/7.0.1xx' changes 2022-09-14 19:44:19 +00:00
dotnet-bot
e798816339 Merge in 'release/6.0.4xx' changes 2022-09-14 19:44:11 +00:00
Marc Paine
547b052b90
Merge pull request #14483 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-09-14 12:33:19 -07:00
Marc Paine
2138fc1031
Merge pull request #14496 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-09-14 12:32:48 -07:00
Marc Paine
c50431e473
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-09-14 12:31:35 -07:00
DotNet-Bot
62d0b8c97f Update dependencies from https://github.com/dotnet/arcade build 20220913.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7
2022-09-14 19:03:04 +00:00
DotNet Bot
af8afbac84 Merged PR 25460: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220914.21
- **Date Produced**: September 14, 2022 3:41:14 PM UTC
- **Commit**: 2336f3adc98fface4160b2265684b302bf642fbd
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.304-servicing.22421.4 to 6.0.305-servicing.22464.21][8]
  - **Microsoft.NET.Sdk**: [from 6.0.304-servicing.22421.4 to 6.0.305-servicing.22464.21][8]
  - **NuGet.Build.Tasks**: [from 6.2.1-rc.7 to 6.2.2-rc.1][9]

[8]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC092f7d6&targetVersion=GC2336f3a&_a=files
[9]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GC4be14ee&targetVersion=GC027ca8b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)

[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**:
  - **NuGet.Build.Tasks**: from 6.2.1-rc.7 to 6.2.2-rc.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2022-09-14 18:48:27 +00:00
dotnet-bot
7e396a08f7 Merge in 'release/6.0.1xx' changes 2022-09-14 17:14:37 +00:00
dotnet-bot
cdc80ef9ae Merge in 'release/6.0.3xx' changes 2022-09-14 17:12:59 +00:00
dotnet-bot
570874738b Merge in 'release/6.0.4xx' changes 2022-09-14 17:11:58 +00:00
dotnet-bot
0aad2d30b7 Merge in 'release/7.0.1xx' changes 2022-09-14 17:11:48 +00:00
Doug Bunting
d42f27ecbe
[6.0.1xx] Update template versions from dotnet/aspnetcore (#14485) 2022-09-14 10:00:30 -07:00
Doug Bunting
a5a36d4af5
[6.0.3xx] Update template versions from dotnet/aspnetcore (#14486) 2022-09-14 10:00:19 -07:00
Doug Bunting
ed6ae3ed1e
[6.0.4] Update template versions from dotnet/aspnetcore (#14487) 2022-09-14 10:00:10 -07:00
Doug Bunting
59de5e7e99
[7.0.1] Update template versions from dotnet/aspnetcore (#14490) 2022-09-14 10:00:00 -07:00
DotNet-Bot
952fd4a43a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220914.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk
2022-09-14 16:08:36 +00:00
Jason Zhai
eab89c31eb Merge branch 'release/6.0.4xx' into release/7.0.1xx 2022-09-13 23:00:19 -07:00
dotnet-bot
cfc0f130dc Merge in 'release/6.0.1xx' changes 2022-09-14 04:00:44 +00:00
NET Source-Build Bot
f9c278be33
.NET Source-Build 6.0.109 September 2022 Updates (#14482)
* update global.json and Versions.props for .NET SDK 6.0.109

* Use re-uploaded SB artifacts tarball version

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-09-14 03:50:12 +00:00
Nikola Milosavljevic
581e179517 Remove unneeded ExtraPackageVersionPropsPackageInfo from Roslyn source-build project 2022-09-14 01:43:31 +00:00
Nikola Milosavljevic
fc74ae4df8 Remove roslyn patch 2022-09-14 01:43:18 +00:00
DotNet-Bot
b45ac4a743 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.41
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41
2022-09-14 00:56:34 +00:00
DotNet-Bot
05ac09da1c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.34
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34
2022-09-13 23:54:36 +00:00
dotnet-bot
eb1d52b430 Merge in 'release/6.0.4xx' changes 2022-09-13 22:49:56 +00:00
Marc Paine
5707f80e81
Merge pull request #14479 from vseanreesermsft/internal-merge-6.0.4xx-2022-09-13-1003
Merging internal commits for release/6.0.4xx
2022-09-13 15:37:52 -07:00
Noah Gilson
f1b49a0072 Merged PR 24828: Use mktemp to correctly use temp files
- It does use 700 permissions and create a random name, shouldn't need backports.
2022-09-13 22:09:25 +00:00
Daniel Plaisted
af7672089f Merged PR 25723: use mktemp to correctly use temp files
Apply https://dev.azure.com/dnceng/internal/_git/dotnet-installer/pullrequest/24828 to 6.0.4xx
2022-09-13 22:09:00 +00:00
Michael Simons
8a0eb58a5a
Eliminate 7.0 source-build prebuilts (#14167)
* Add runtime patch to fully qualify conflicting runtime and roslyn APIs

* Add aspnetcore patch for lifetime scope

* Add prebuilt removal patches for fixes that haven't flowed

* Use repo name for git-info version number special cases

* Delete aspnetcore patches

* Update Microsoft.Deployment.DotNet.Releases Versions.Details.xml dependency

* Remove backported sdk patch

* Add runtime patch to disable analyzers

* Add patch to remove app host prebuilt

* Add source-build patch for jwt prebuilt

* Add patches for command-line-api and msbuild net7.0 TFM

* Update aspnetcore patch

* Update source-build-externals

* Update aspnetcore patch

* Add source-build-externals patch

* Update SBRP version

* Revert tfm patches

* Revert "Revert tfm patches"

This reverts commit 9cf3f5f6230c0f88e0a9955dbeb545495bc3e855.

* Revert msbuild net70 tfm patch

* misc updates

* Add linker patch

* Add linker patch

* Add patch for retargeting fsharp

* Add patch for retargeting sdk

* Resolve patch conflict from latest merge

* Remove failing patches

* Remove unnecessary patch

* Re-add msbuild patch for net7.0 TFM

* Revert "Remove failing patches"

This reverts commit 9ca3256e9b670d2fc23aeebb785fa8b5c5cca6a4.

* Fix fsharp patch

* Fix msbuild patch typo

* Update fsharp patch

* Clean up SDK patch

* Resolve patch conflicts from last merge

* Fix discrepancy between versions of DotNetDeltaApplier TFM version

* Update SDK patch

* Fix fsharp patch

* Fix msbuild build error

* Update nuget-client to net7.0

* Update order of projects in known-good

* Fix fsharp xml doc path for net7.0

* Add missing change in msbuild patch

* Fix SDK patch

* Add runtime patch for targeting net7.0

* Fix runtime-portable build

* Add patch for roslyn-analyzers net7.0 TFM

* Fix runtime patches

* Add patch for targeting net7.0 in roslyn

* Fix Microsoft.CSharp.Core.targets location

* Update patches

* Update roslyn patch

* Update prebuilts version

* Update roslyn patch again

* Add vstest patch for targeting net7.0

* Change minimum supported TFM in runtime

* Revert "Add vstest patch for targeting net7.0"

This reverts commit 9049c9f585e52194312118ad8e5d15c0d19296b2.

* Add patch to update compatibility suppressions in runtime

* Use dev/haplois/net67 branch of vstest for validation. PR: https://github.com/microsoft/vstest/pull/3944

* Get rid of 2.0.X prebuilts from xliff

* Disable targeting windows in roslyn for source-build

* Delete backported runtime patches

* Fix xliff patch

* Remove backported roslyn patch

* Remove backported fsharp patch

* Update SDK patch

* Remove backported source build patches

* Update patches

* Remove roslyn patch for net7.0 TFM

* Update SDK patch roslyn bits location

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-09-13 15:55:40 -05:00
Matt Mitchell
0490cee5fe
[release/7.0.1xx] Inbuild sign on (#14471)
* In build sign enable

* Update arcade
2022-09-13 19:26:52 +00:00
Sean Reeser
24feaa10a1 Merge commit '58a93139d80490d0724b4d862ba8ee00ceae45d3' into internal-merge-6.0.1xx-2022-09-13-1003 2022-09-13 10:03:50 -07:00
Sean Reeser
1fdee73365 Merge commit 'd61314894c0fdcdb6e9d9c9f1ff5f8a483570d33' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-13 10:03:41 -07:00
Sean Reeser
2115855cf9 Merge commit '0906eae6f8c72882c197e346b9125f0b69c4b3a7' into internal-merge-6.0.4xx-2022-09-13-1003 2022-09-13 10:03:32 -07:00
73436261e3
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516) 2022-09-13 09:20:55 -04:00
Noah Gilson
be85081b6f use mktemp to correctly use temp files 2022-09-12 21:35:42 -04:00
DotNet-Bot
4ba209a45a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220912.31
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31
2022-09-13 00:20:00 +00:00
dotnet-maestro[bot]
eaac63b9d7
Update dependencies from https://github.com/dotnet/arcade build 20220908.5 (#14468)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22418.4 -> To Version 7.0.0-beta.22458.5

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 4.4.0-3.22431.2 -> To Version 4.4.0-3.22430.19 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-12 09:14:15 -05:00