Commit graph

4919 commits

Author SHA1 Message Date
Jason Zhai
732667a98a Merge branch 'release/6.0.4xx' into main 2022-06-09 02:49:42 -07:00
Jakub Jareš
47c53d5fa0
Merge pull request #13939 from nohwnd/fix-dump-minitool 2022-06-09 10:12:01 +02:00
Jakub Jareš
0c7c5381b9 Fix cross-gen for DumpMinitool 2022-06-09 08:06:36 +02:00
Marc Paine
138d21e534
Merge pull request #13863 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build by getting debuild first
2022-06-08 13:05:45 -07:00
Marc Paine
fd0c042c55
Merge pull request #13864 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build
2022-06-08 13:05:42 -07:00
Marc Paine
92f9b7b00d
Merge pull request #13908 from dotnet/marcpopMSFT-fixdebbuild
Remove the external docker files and fix the debbuild
2022-06-08 13:05:34 -07:00
Jo Shields
15e1a9aee6
Merge pull request #13909 from directhex/bionic-means-bionic
Add linux-bionic-* known runtime packs
2022-06-08 13:10:20 -04:00
Jo Shields
7bb09b3f1c
Update src/redist/targets/GenerateBundledVersions.targets
Co-authored-by: Mitchell Hwang <16830051+mdh1418@users.noreply.github.com>
2022-06-08 10:30:15 -04:00
Jakub Jareš
a1fbbff57a Fix cross-gen for dumpMinitool 2022-06-08 12:42:54 +02:00
Safia Abdalla
116a6a8bc5
Integrate new user-jwts tool into installer (#13895) (#13913) 2022-06-07 15:20:07 -07:00
Jo Shields
fe8ff26c2f Suggestions from Mitch 2022-06-07 10:42:47 -04:00
Jo Shields
1aff5868fe Address suggestions from Alex 2022-06-07 10:40:28 -04:00
Jo Shields
9ce0f2d93f Merge remote-tracking branch 'origin/main' into bionic-means-bionic 2022-06-07 10:37:28 -04:00
Marc Paine
56835d056c
Merge pull request #13860 from dotnet/darc-main-a10368cf-c86f-4fe5-8dea-f2288a402684
[main] Update dependencies from dotnet/sdk
2022-06-05 18:08:13 -07:00
MichaelSimons
288f35bf46 Disable tarball CI until previous source-built artifacts are updated 2022-06-06 00:05:51 +00:00
Jo Shields
ea927d477b Add linux-bionic-* known runtime packs.
Without this, `dotnet publish -r linux-bionic-x64` uses vanilla linux-x64
2022-06-03 13:52:08 -04:00
Marc Paine
8b16a6268f
Only run the deb build on specific legs 2022-06-03 09:12:24 -07:00
Marc Paine
86f3ab2e74
Merge pull request #13883 from dotnet/marcpopMSFT-removepostinstall
Remove the welcome text from the postinstall scripts in favor of the first run experience
2022-06-02 10:48:55 -07:00
Chris Rummel
8a403e1fd0
Fixthis with a patch instead of a parameter - parameters are not passed through to runtime-prereqs. 2022-06-01 10:40:55 -05:00
Chris Rummel
9278c435f5
Ignore missing native SourceLink metadata in source-build.
This returns the source-build behavior to what it was doing before ff5840bbe6.   More investigation is needed on whether there needs to be another fix to native sourcelink in source-build but this will fix the build for now.
2022-05-31 14:51:27 -05:00
Grace Kulin
cb6f7680d6
Merge pull request #13873 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-05-31 08:45:24 -07:00
Marc Paine
949b047558
Merge pull request #13880 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-05-27 16:30:26 -07:00
Marc Paine
523d64bcbf
Update after_install_host.sh 2022-05-27 16:25:24 -07:00
Marc Paine
f7a690e650
Update postinst 2022-05-27 16:24:26 -07:00
dotnet-bot
43f9b18481 Merge in 'release/6.0.3xx' changes 2022-05-27 18:09:36 +00:00
Marc Paine
8845807f72
Update GenerateBundledVersions.targets 2022-05-27 10:22:17 -07:00
Marc Paine
6c07a124b9
Update GenerateBundledVersions.targets 2022-05-27 10:20:07 -07:00
Logan Bussell
c571d5ea85
[main] Add patch that retargets arcade projects to net7.0 (#13874)
* Add patch that retargets arcade projects to net7.0

* add patches to bootstrap arcade net7.0 tfm version

* Replace net6.0 references with 7.0 in source build
2022-05-26 20:20:44 +00:00
Marc Paine
1a6c2ec527
Merge pull request #13865 from jonathanpeppers/maui-ga-workloads-net7-sdk
Update MAUI GA manifests
2022-05-26 08:04:44 -07:00
Jason Zhai
7c36f6abfd Merge branch 'release/6.0.4xx' into main 2022-05-26 00:04:33 -07:00
Michael Simons
d00771f511
Enable the sdk and installer repos in source-build (#13846) 2022-05-24 16:25:20 -05:00
Jonathan Peppers
4356fe6410 Update MAUI GA manifests
This partially reverts c365b60b, and adds MAUI 6.0.300 manifests to
the .NET 7 SDK.

After `.\build.cmd -pack -publish`, manually tested the workloads:

    > .\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update
    Installing pack Microsoft.Android.Sdk version 32.0.301...

I could `dotnet new android` and the app would build & run using:

    ~\.nuget\packages\microsoft.netcore.app.runtime.mono.android-arm64\6.0.5\runtimes\android-arm64\native\libmonosgen-2.0.so

Next, I installed `artifacts\packages\Debug\Shipping\dotnet-sdk-7.0.100-dev-win-x64.exe`
and installed the `maui` workload:

    > dotnet workload install maui --skip-manifest-update
    Skipping NuGet package signature verification.
    ...
    Successfully installed workload(s) maui.

After this I could still open Visual Studio, create MAUI projects, and
build/run them.

In a future PR, we can update the SDK use .NET 7 workloads. We are
still working on getting every platform & pack under MAUI over to .NET 7.
2022-05-24 14:26:27 -05:00
Marc Paine
b6032c3f2c
Merge pull request #13853 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-05-20 15:34:38 -07:00
Michael Simons
6430ec6007
Remove sha from source tarball repo dir names (#13854) 2022-05-19 14:02:06 -05:00
DotNet Bot
cc7da5b9f3 Merged PR 23001: [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.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22255.5 to 6.0.6-servicing.22267.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## Fro...
2022-05-18 21:57:33 +00:00
v-wuzhai
a84c4c0a87
Merge pull request #13789 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-05-17 20:59:00 -07:00
Logan Bussell
2ada9250a8
[main] Enable razor-compiler and format in Source-Build (#13844) 2022-05-18 03:35:12 +00:00
dotnet-maestro[bot]
d43539eeb5
[main] Update dependencies from dotnet/sdk (#13811)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-preview.5.22259.9 to 7.0.0-preview.5.22266.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-preview.5.22259.5 to 7.0.100-preview.5.22267.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-preview.5.22259.5 to 7.0.100-preview.5.22267.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-preview.4.22257.1 to 7.0.0-preview.4.22264.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.5.22259.2 to 7.0.0-preview.5.22264.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-preview.5.22259.1 to 7.0.0-preview.5.22264.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.3.0-preview-20220509-01 to 17.3.0-preview-20220516-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22259.1 to 7.0.100-1.22266.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.3.0-2.22259.9 to 4.3.0-2.22266.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.3.0-preview-22256-03 to 17.3.0-preview-22263-02 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-preview.5.22258.4 to 7.0.0-preview.5.22266.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.4.22215.1 to 7.0.0-preview.5.22252.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - Microsoft.SourceBuild.Intermediate.source-build-externals: from 7.0.0-alpha.1.22255.1 to 7.0.0-alpha.1.22259.2 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' into darc-main-116d39ae-bf4b-46a2-b22a-cd7fba818000

 - Remove runtime patch that was upstreamed
2022-05-17 23:55:57 +00:00
Michael Simons
9c7c2210aa
Remove the source-build tarball scripts directory (#13843) 2022-05-17 18:09:04 -05:00
Jason Zhai
6e89ea62c7 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-15 21:30:09 -07:00
Logan Bussell
b555f1cb54
[main] Onboard roslyn-analyzers and aspnetcore to source-build (#13830) 2022-05-13 15:24:06 -05:00
Chris Rummel
b648ad31b1
[main] Handle NuGet package source mapping in source-build tasks. (#13788) 2022-05-13 14:52:42 -05:00
Logan Bussell
59df269041
[main] Onboard runtime-portable and runtime (#13770)
* Enable runtime and runtime-portable in source-build known-good.proj

* Add patch that retargets runtime to net7.0

* Re-enable RepositoryReferences to runtime in other repos
2022-05-12 17:09:11 -07:00
Michael Simons
e7e17f8252
Update TestScenario to use rid based on current arch (#13819) 2022-05-11 13:35:39 -05:00
Jason Zhai
81727dce7a Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-05-10 23:31:14 -07:00
Jason Zhai
d0481884ef Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-10 23:21:04 -07:00
NET Source-Build Bot
9fe7aa2179
update global.json and Versions.props for .NET SDK 6.0.105 (#13821) 2022-05-11 04:25:00 +00:00
vseanreesermsft
72a85dfc6a
Merging internal commits for release/6.0.1xx (#13812)
* Merged PR 22398: [internal/release/6.0.1xx] 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.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.104-servicing.22164.8 to 6.0.105-servicing.22214.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.0.1-1.22157.22 to 4.0.1-1.22181.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b...

* Merged PR 22415: [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**: 20220418.14
- **Date Produced**: April 18, 2022 10:36:29 PM UTC
- **Commit**: e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7882da0&targetVersion=GCe910b87&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 22459: Update source-build to AspNetCoreSharedFxInstallerRid property rename

AspNetCoreSharedFxInstallerRid was renamed to AspNetCoreInstallerRid in 7ce479f5e7.

* Merged PR 22507: [internal/release/6.0.1xx] 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.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220420.15
- **Date Produced**: April 20, 2022 5:24:23 PM UTC
- **Commit**: 0ad59d00ed13d3b5cd1343efb4dde64714f70063
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe910b87&targetVersion=GC0ad59d0&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0636f1e&targetVersion=GCad94063&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfcb07d6&targetVersion=GC14bf2e5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208...

* Merged PR 22538: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220421.11
- **Date Produced**: April 21, 2022 4:12:47 PM UTC
- **Commit**: ce948f426d1c884d4a7315bd4d745590a797bd48
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0ad59d0&targetVersion=GCce948f4&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
2022-05-10 17:36:26 -07:00
Marc Paine
71250d9bb3
Update GenerateBundledVersions.targets 2022-05-10 12:25:57 -07:00
Sean Reeser
e90af97f22 Merge commit '8473146e7d8d3de5d9558239c46e62d12314d52b' into internal-merge-6.0.3xx-2022-05-10-1208 2022-05-10 12:08:23 -07:00
Marc Paine
cc20380d85
Merge pull request #13735 from dotnet/marcpopMSFT-crosstargetarm64apphosts
Add the cross-targeting app host packs to the arm64 installer
2022-05-10 09:44:28 -07:00
Michael Simons
ccef905a85
Enable fsharp build in source-build tarball (#13738) 2022-05-10 08:50:32 -05:00
kasperk81
964dcb8c61 feedback 2022-05-06 19:51:23 +00:00
Jason Zhai
ba17ad6b29 Merge branch 'release/6.0.4xx' into main 2022-05-05 19:42:03 -07:00
kasperk81
c7b912c82f add known ilcompiler pack 2022-05-06 02:00:13 +00:00
Marc Paine
c86711a10d
Merge pull request #13680 from dotnet/marcpopMSFT-placeholderversion
Add the major minor version to two of our transport packages to enabl…
2022-05-05 10:45:23 -07:00
Jason Zhai
305c2d164e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-04 21:15:38 -07:00
Michael Simons
2e47208356
Fix two broken <repo.sha> path references (#13745) 2022-05-03 18:56:39 -05:00
Daniel Plaisted
085ba133f7
Merge pull request #13360 from dsplaisted/linux-arm64-and-mariner2
Add Arm64 RHEL builds
2022-05-03 16:45:19 -07:00
Marc Paine
edea73be18
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-05-03 14:59:41 -07:00
Marc Paine
49c376098d
Merge pull request #13748 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-05-03 14:59:23 -07:00
Daniel Plaisted
921c0441d0
Merge pull request #13640 from dsplaisted/linux-arm64-and-mariner2-6.0.3xx
Add Mariner 2.0 and Arm64 RHEL builds (6.0.3xx)
2022-05-03 14:39:14 -07:00
Daniel Plaisted
604e870a20 Add Mariner 2.0 and Arm64 RHEL builds 2022-05-03 18:36:09 -03:00
dotnet-maestro-bot
53fd800db0
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx' (#13734)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1

* Remove sha from source tarball repo dir names (#13726)

* Update smoke-test prereq artifact to include architecture (#13725)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-05-03 10:25:02 -07:00
Michael Simons
01764815de
Update smoke-test prereq artifact to include architecture (#13725) 2022-04-29 14:37:32 -05:00
Michael Simons
2648727d88
Onboard templating repo into source-build tarball (#13724) 2022-04-29 14:07:03 -05:00
Marc Paine
5e261ae1f9 Add the cross-targeting app host packs to the arm64 installer 2022-04-29 10:53:10 -07:00
Michael Simons
2d73d3d8bf
Remove sha from source tarball repo dir names (#13726) 2022-04-29 12:50:28 -05:00
William Godbe
4b6704c463
Merge pull request #13704 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-04-27 15:59:55 -07:00
Marc Paine
a1c6cec9ab
Merge pull request #13682 from martincostello/more-productcommit-versions
Extend productCommit-rid.txt
2022-04-27 14:36:38 -07:00
Daniel Plaisted
e78caf9137 Add Mariner 2.0 and Arm64 RHEL builds 2022-04-27 11:31:41 -03:00
Jason Zhai
ed70dff20b Merge branch 'release/6.0.4xx' into main 2022-04-27 01:29:14 -07:00
v-wuzhai
aefb6768a2
Merge pull request #13678 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-04-25 19:31:55 -07:00
Jacques Eloff
407e1ca136
Remove pathcch dependency (#13646) 2022-04-24 21:27:50 -07:00
martin-costello
024ab2f377 Comment consistency
Make all variables in the comment quoted with `%`.
2022-04-22 09:49:26 +01:00
Logan Bussell
d7e8cfeb7a
add razor-compiler to source-build (#13679) 2022-04-21 13:34:55 -07:00
martin-costello
2b0fc69f4e Fix typo
Fix missing `k`.
2022-04-21 16:44:41 +01:00
martin-costello
a3e8652e50 Extend productCommit-rid.txt
Extend the changes from #13132 to include the versions of the ASP.NET Core shared runtime, Windows Desktop and the .NET SDK itself.
2022-04-21 16:13:56 +01:00
Jason Zhai
e3ae2d8e68 Merge branch 'release/6.0.4xx' into main 2022-04-20 23:19:28 -07:00
dotnet-bot
d3916de4f7 Merge in 'release/6.0.3xx' changes 2022-04-21 03:07:58 +00:00
v-wuzhai
20e198c744
Merge pull request #13673 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-20 19:57:12 -07:00
Marc Paine
8be158f06d Add the major minor version to two of our transport packages to enable SxS installs in previews 2022-04-20 16:51:31 -07:00
DotNet Bot
91c6682f9e Merged PR 22483: [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.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.300-preview.22208.4 to 6.0.300-rtm.22215.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.FSharp.Compiler**: fr...
2022-04-20 23:43:56 +00:00
Michael Simons
73d8fb56fa
Enable deployment-tools, msbuild, and vstest repos in source-build (#13677) 2022-04-20 15:40:57 -05:00
Michael Simons
f312ae0fe8
Enable linker and package-source-build in source-build (#13669) 2022-04-20 11:59:01 -05:00
v-wuzhai
bd888b3457
Merge pull request #13661 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-19 19:36:57 -07:00
v-wuzhai
69fe928672
Merge pull request #13655 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-19 19:36:48 -07:00
Michael Simons
2a412d3454
Remove CheckSourceBuiltNupkgConflictUsages target (#13668) 2022-04-19 17:23:25 -05:00
Michael Simons
038c811c97
Enable all tier 1 repos in source-build (#13658) 2022-04-19 17:19:00 -05:00
Michael Simons
65dd7c1427
Remove net TFMs from xml doc baseline (#13662) 2022-04-19 22:00:36 +00:00
Michael Simons
35803a779f
Update source-build projects to net7.0 (#13663) 2022-04-19 16:50:46 -05:00
Logan Bussell
4acd960d76
[main] Build arcade and sourcelink in source-build tarball (#13657)
* build arcade and sourcelink in source-build tarball

* update arcade target framework override to reflect change in arcade package output

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-04-19 18:47:29 +00:00
Bo Anderson
e44e5907d6
Fix compatibility with BSD df (#13653) 2022-04-19 08:44:59 -05:00
v-wuzhai
789db9e502
Merge pull request #13649 from dotnet/darc-main-158162d1-d711-4622-b087-ce4608ffb6de
[main] Update dependencies from dotnet/sdk
2022-04-18 18:36:31 -07:00
Logan Bussell
ca04284533
[main] Re-enable Source Build Tarball Build CI and disable all repo builds (#13605)
* re-enable tarball build in C

* remove all projects except SBRP from known-good

* disable smoke tests until more repos are building

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-04-18 10:44:38 -07:00
Daniel Plaisted
d46c9533f7
Merge pull request #13632 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-18 06:57:07 -07:00
MichaelSimons
c799829d17 Remove source-build patch that was backported 2022-04-18 13:43:41 +00:00
Michael Simons
21c7bb3abb
Fix threading issue in ExecuteHelper (#13643) 2022-04-15 15:24:48 -05:00
Jason Zhai
28b49f8e2d Merge branch 'release/6.0.4xx' into main 2022-04-14 23:36:46 -07:00
Michael Simons
5609d7db88
Exclude sdk content tests in PR validation and public CI (#13644) 2022-04-14 20:19:51 -05:00
Michael Simons
1f059f340c
[source-build] Expose CleanWhileBuilding msbuild option in build.sh (#13642) 2022-04-15 00:14:43 +00:00
Marc Paine
04e40fa940
Merge pull request #13629 from dotnet/marcpopMSFT-60300manifests
Update all workloads to the April release of 6.0.300 manifests
2022-04-14 14:20:25 -07:00
Michael Simons
3da46c012c
Add retry to omnisharp download (#13639) 2022-04-14 21:20:25 +00:00
Marc Paine
8ed3ae9f13
Fix the source build leg for the 300 workloads 2022-04-14 13:17:10 -07:00
Michael Simons
ec6f14da69
Update MsftToSbSdk baseline in response to SBRP text-only package fix (#13628) 2022-04-14 12:48:49 -05:00
dotnet-maestro-bot
d419470991
Add patch for linker prebuilt (#13630) (#13633)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-04-14 03:27:25 +00:00
Michael Simons
9104a1f6e4
Add patch for linker prebuilt (#13630) 2022-04-13 21:49:19 -05:00
Logan Bussell
9563e594c5
[release/6.0.1xx] Retry source-build artifacts download on failure (#13591)
* retry source-built artifacts download with curl
2022-04-13 17:43:13 -07:00
Marc Paine
3ddadcc14f
Update all workloads to the April release of 6.0.300 manifests 2022-04-13 13:33:27 -07:00
Matt Mitchell
14330ee057
Merge branch 'release/6.0.3xx' into merge/release/6.0.2xx-to-release/6.0.3xx 2022-04-13 09:37:28 -07:00
Marc Paine
f17fb6728c
Final branding for 6.0.300 (#13608) 2022-04-13 08:02:27 -07:00
Matt Mitchell
40f5222a0d
Merge pull request #13602 from vseanreesermsft/internal-merge-6.0.1xx-2022-04-12-1157
Merging internal commits for release/6.0.1xx
2022-04-13 07:47:09 -07:00
v-wuzhai
314db6c4f5
Merge pull request #13587 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-04-12 17:55:02 -07:00
NET Source-Build Bot
8d32713c4e
update global.json and Versions.props for .NET SDK 6.0.104 (#13607) 2022-04-13 00:36:01 +00:00
William Godbe
6bfbfe26a7
Update asp.net templates/downlevel runtimes (#13546)
* Update asp.net templates/downlevel runtimes

* Update GenerateBundledVersions.targets
2022-04-12 20:39:29 +00:00
Sean Reeser
72e5a349ae Merge commit '915d644e451858f4f7c6e1416ea202695ddd54fb' into internal-merge-6.0.1xx-2022-04-12-1157 2022-04-12 11:57:14 -07:00
Sean Reeser
8e7442b2d8 Merge commit 'f8a55617d250f5db711e7425428671da5f1967a3' into internal-merge-6.0.2xx-2022-04-12-1157 2022-04-12 11:57:07 -07:00
MichaelSimons
c3accde0dc Remove aspnetcore source-build patch that was already backported 2022-04-12 14:24:18 +00:00
Jason Zhai
3087490b26 Merge branch 'release/6.0.3xx' into main 2022-04-11 19:46:23 -07:00
Jason Zhai
3d646a39f9 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-10 21:23:03 -07:00
MichaelSimons
2f7d7bbfeb Resolve source-build patch conflict 2022-04-08 18:29:50 +00:00
Jason Zhai
316d39733a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-07 19:50:15 -07:00
Michael Simons
ad01a74f43
Add arm64 leg to CI (#13500) 2022-04-07 11:34:26 -05:00
Michael Simons
49444f300c
Build aspnetcore project templates in source-build (#13459) 2022-04-07 08:12:37 -05:00
MichaelSimons
d277a44e4c Removed backported vstest source-build patch 2022-04-06 21:52:48 +00:00
Jason Zhai
0a94cacbf6 Merge branch 'release/6.0.3xx' into main 2022-04-06 00:40:27 -07:00
dotnet-maestro[bot]
e779f0adeb
[main] Update dependencies from dotnet/sdk (#13524)
* Update dependencies from https://github.com/dotnet/sdk build 20220401.3

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.3

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.2.0-preview-20220308-05 -> To Version 17.2.0-preview-20220401-07 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.5

Dependency coherency updates

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.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.7

Dependency coherency updates

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-secrets,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.8

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.8

Dependency coherency updates

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-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.7 -> To Version 7.0.0-preview.4.22201.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220401.11

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22201.11

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-secrets,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220402.1

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.1

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220402.2

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.2

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220402.3

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22202.3

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220404.1

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.4.22201.1 -> To Version 7.0.100-preview.4.22204.1

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.4.22180.5 -> To Version 7.0.0-preview.4.22181.1 (parent: Microsoft.NET.Sdk

* Remove vstest source-build patch that was backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-04-04 14:53:40 +00:00
Jason Zhai
e2dc4a8562 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-01 19:48:09 -07:00
v-wuzhai
9d2f43f3de
Merge pull request #13513 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-01 00:18:17 -07:00
Chris Rummel
f6e3766b7a
Add source-build leak detection (#13434) 2022-03-31 19:12:59 -05:00
Michael Simons
011137efdc
Merge pull request #13494 from dotnet/darc-release/6.0.3xx-a94726bb-356e-4dff-8123-3b2fee1943e8
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-30 20:49:27 -05:00
MichaelSimons
5ad51d6f86 Remove source-build patches that were backported 2022-03-31 00:35:58 +00:00
Michael Simons
6411930b69
Merge pull request #13492 from dotnet/darc-main-c3d48740-9901-4ab9-89e4-ab628f78b98e
[main] Update dependencies from dotnet/sdk
2022-03-30 14:39:18 -05:00
MichaelSimons
9e3f77b66d Remove roslyn source-build patches that were backported 2022-03-30 18:19:27 +00:00
Michael Simons
ec8c3c5124 Remove CliCommandLineParser from source-build 2022-03-29 12:53:53 -05:00
Marc Paine
197e06982e
Update implicit version for March release 2022-03-29 10:22:40 -07:00
Marc Paine
5a16cd63d9
Merge pull request #13473 from dotnet/darc-main-f7696490-138e-4123-aaa4-a1273a9e8fb5
[main] Update dependencies from dotnet/sdk
2022-03-28 11:21:35 -07:00
MichaelSimons
091f8bc4e9 Remove additional NuGet.Client source-build patch that was backported 2022-03-28 16:19:26 +00:00
dotnet-maestro[bot]
75b3006c8a
[release/6.0.3xx] Update dependencies from dotnet/sdk (#13455)
* Update dependencies from https://github.com/dotnet/sdk build 20220323.4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.2.0-2.22171.5 -> To Version 4.2.0-2.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.8

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.10

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.13

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.16

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.16

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220323.17

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.17

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220324.5

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Fix test for api change in sdk.

* Update dependencies from https://github.com/dotnet/sdk build 20220324.11

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.11

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220324.13

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22173.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220325.2

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.2

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220325.7

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.7

* Update dependencies from https://github.com/dotnet/sdk build 20220325.9

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22175.7 -> To Version 6.0.300-preview.22175.9

* Update dependencies from https://github.com/dotnet/sdk build 20220325.12

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22175.9 -> To Version 6.0.300-preview.22175.12

* Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220328.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22178.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Remove NuGet.Client source-build patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-28 09:16:59 -07:00
dotnet-maestro-bot
a2a2f48f83
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx' (#13461) (#13469)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1

* Update source-build with 6.0.103 artifacts

* Disable public source-build tarball ci (#13377)

* Fix invalid pipeline trigger.

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1

* Update dependencies from https://github.com/dotnet/arcade build 20220309.8

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8

* Remove maui workloads from 6.0.100

The old workloads break MU so we either have to update them or remove them.

* Only do signcheck if there are files to sign check

* Remove template text-only packages which are alread included in source-build (#13380)

* Update dependencies from https://github.com/dotnet/arcade build 20220311.1

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1

* Update source-build MsftToSbSdk.diff baseline (#13400)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1

* [release/6.0.1xx] Windows SDK projection update

* [release/6.0.1xx] dotnet watch smoke test (#13392)

* add dotnet watch smoke test

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Refactor build.sh to optimize PackageVersions.props retrieval (#13443)

* Update NuGet path issue in Run Tests CI step (#13453)

* Refactor SdkContentTests to warn on diffs when run in CI (#13432)

* Revert the Versions.props file

* Revert the Versions.props file

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-03-28 09:15:59 -07:00
MichaelSimons
5a4e58099a Remove NuGet.Client source-build patches that were backported 2022-03-28 14:54:03 +00:00
dotnet-maestro-bot
6791ff652b
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx' (#13461)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1

* Update source-build with 6.0.103 artifacts

* Disable public source-build tarball ci (#13377)

* Fix invalid pipeline trigger.

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1

* Update dependencies from https://github.com/dotnet/arcade build 20220309.8

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8

* Remove maui workloads from 6.0.100

The old workloads break MU so we either have to update them or remove them.

* Only do signcheck if there are files to sign check

* Remove template text-only packages which are alread included in source-build (#13380)

* Update dependencies from https://github.com/dotnet/arcade build 20220311.1

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1

* Update source-build MsftToSbSdk.diff baseline (#13400)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1

* [release/6.0.1xx] Windows SDK projection update

* [release/6.0.1xx] dotnet watch smoke test (#13392)

* add dotnet watch smoke test

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Refactor build.sh to optimize PackageVersions.props retrieval (#13443)

* Update NuGet path issue in Run Tests CI step (#13453)

* Refactor SdkContentTests to warn on diffs when run in CI (#13432)

* Revert the Versions.props file

* Revert the Versions.props file

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-03-25 09:58:21 -07:00
Michael Simons
9a5c6656c6
Merge pull request #13457 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-03-24 08:21:42 -05:00
Marc Paine
0e5019720b
Merge pull request #13448 from dotnet/sdl
Add SDL checks
2022-03-23 14:37:20 -07:00
dotnet-maestro[bot]
96c8cd8592
[main] Update dependencies from dotnet/sdk (#13376)
* Update dependencies from https://github.com/dotnet/sdk build 20220309.17

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22159.17

Dependency coherency updates

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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220310.15

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22160.15

Dependency coherency updates

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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220310.18

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22160.18

Dependency coherency updates

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-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220311.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22161.5

Dependency coherency updates

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-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22160.15 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-23 17:56:05 +00:00
Michael Simons
211912bd41
Refactor SdkContentTests to warn on diffs when run in CI (#13432) 2022-03-23 12:25:05 -05:00
Michael Simons
a9d43d1d3d
Update NuGet path issue in Run Tests CI step (#13453) 2022-03-23 12:24:28 -05:00
dotnet-bot
c7c896d0bb Merge in 'release/6.0.1xx' changes 2022-03-21 13:25:22 +00:00
Michael Simons
46c2e6ddf7
Refactor build.sh to optimize PackageVersions.props retrieval (#13443) 2022-03-21 08:13:23 -05:00
DotNet Bot
4ff8f79c3d Merged PR 21732: [internal/release/6.0.2xx] 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.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22123.7 to 6.0.202-servicing.22165.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0...
2022-03-21 01:08:23 +00:00
DotNet Bot
10e0e1e567 Merged PR 21560: [internal/release/6.0.1xx] 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.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22123.6 to 6.0.104-servicing.22164.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22124.2 to 6.0.4-servicing.22165.3 (parent:...
2022-03-21 01:07:52 +00:00
Jacques Eloff
887e46cae6 Add SDL checks 2022-03-20 01:29:22 -07:00
Michael Simons
57292e300c Make a source-build targetted fix to unblock release 2022-03-17 13:29:45 -05:00
Michael Simons
64addbe5bf Fix issue with BundledTemplates condition 2022-03-17 13:29:36 -05:00
Michael Simons
aff4e2553e Make a source-build targetted fix to unblock release 2022-03-17 12:38:23 -05:00
Michael Simons
fe2e9b9fb8 Fix issue with BundledTemplates condition 2022-03-17 10:57:41 -05:00
Jason Zhai
74bb220c7b Merge branch 'release/6.0.3xx' into main 2022-03-15 20:01:24 -07:00
Logan Bussell
bc714f97e9
[release/6.0.1xx] dotnet watch smoke test (#13392)
* add dotnet watch smoke test
2022-03-15 11:00:38 -07:00
Jason Zhai
b6ca26dd0b Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-03-15 01:56:45 -07:00
Marc Paine
6a8cc38b66
Merge pull request #13417 from dotnet/marcpopMSFT-fixduplicatepackages
Revert prior templatelocator and msbuildextension changes as they weren't required
2022-03-14 16:50:06 -07:00
Marc Paine
ab3ddec440 Revert prior changes as only the first and last change were actually needed. 2022-03-14 14:27:34 -07:00
Marc Paine
c365b60bad
Merge pull request #13390 from dotnet/marcpopMSFT-removemaui601
Remove maui workloads from 6.0.100
2022-03-14 14:22:49 -07:00
MichaelSimons
8ec456efa7 Remove unnecessary runtime source-build patch 2022-03-14 14:46:02 +00:00
Michael Simons
146dc6feac Correct difference in source-build pipeline pool references 2022-03-14 09:18:08 -05:00
Jason Zhai
61d316d9df Merge branch 'release/6.0.3xx' into main 2022-03-14 02:50:13 -07:00
Marc Paine
2d5f6fc8bd
Add additional hostfxr versions (#13404)
* Update the nuspec as well to remove the duplicates

* Add additional architecture
2022-03-11 18:57:30 -08:00
Michael Simons
a6c57692ab
Update source-build MsftToSbSdk.diff baseline (#13400) 2022-03-12 01:18:34 +00:00
Marc Paine
37f553ace2 Add additional architecture 2022-03-11 16:49:39 -08:00
Marc Paine
bfebed846a
Merge branch 'main' into merge/release/6.0.3xx-to-main 2022-03-11 15:57:47 -08:00
Michael Simons
69ea868ac1
Fix source-build graph in Version.Details.xml (#13384) 2022-03-11 15:53:22 -06:00
Michael Simons
1b84fc233f
Remove template text-only packages which are alread included in source-build (#13380) 2022-03-11 15:49:32 -06:00
Marc Paine
c9bae215ef
Merge pull request #13397 from dotnet/marcpopMSFT-fixduplicatepackages
Only produce one version of the swr file.
2022-03-11 11:56:16 -08:00
Michael Simons
a65da76e23
Merge pull request #13395 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-03-11 13:37:32 -06:00
Marc Paine
da96094fde Only produce one version of the swr file. 2022-03-11 10:17:05 -08:00
MichaelSimons
90153d2939 Remove aspnetcore patch that was backported 2022-03-11 15:02:26 +00:00
Jason Zhai
9fa0019355 Merge branch 'release/6.0.3xx' into main 2022-03-10 23:36:54 -08:00
Marc Paine
2cf433858f
Update the nuspec as well to remove the duplicates (#13393) 2022-03-10 20:07:24 -08:00
Jason Zhai
36fa54c321 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-10 18:58:21 -08:00
Marc Paine
290291a0da Only do signcheck if there are files to sign check 2022-03-10 16:57:47 -08:00
Marc Paine
2c17f40ecf
Remove maui workloads from 6.0.100
The old workloads break MU so we either have to update them or remove them.
2022-03-10 14:03:12 -08:00
Marc Paine
c10ad05ffb
Merge pull request #13385 from dotnet/marcpopMSFT-fixduplicatepackages
Fix duplicate packages
2022-03-10 13:59:49 -08:00
Jacques Eloff
faa618ce2d
Ensure finalizer.exe is always cached (#13388) 2022-03-10 12:23:35 -08:00
Doug Bunting
f29b6a1f4f
[main] Bump aspnetcore template versions (#13368)
* [main] Bump aspnetcore template versions
- we release a new targeting pack every time
- bump 3.1 through 6.0 `$(VersionFeatureXX)` values

* Update GenerateBundledVersions.targets

Co-authored-by: William Godbe <wigodbe@microsoft.com>
2022-03-10 11:06:30 -08:00
Marc Paine
18f1baa6e6
Fix duplicate packages 2022-03-10 09:08:26 -08:00
Jason Zhai
85a7a87220 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-09 22:10:08 -08:00
Michael Simons
b58bb0b579 Resolve merge issues in source-build 2022-03-09 19:43:01 -06:00
Michael Simons
ec5ed63d8c
Merge branch 'release/6.0.2xx' into merge/release/6.0.1xx-to-release/6.0.2xx 2022-03-09 19:31:32 -06:00
MichaelSimons
ca2b7c8cbe Update source-build with 6.0.103 artifacts 2022-03-10 00:19:52 +00:00
Michael Simons
ad22b53f36
Disable source-build tarball build in CI (#13351) 2022-03-09 16:22:23 +00:00
vseanreesermsft
08f3930ac3
Merging internal commits for release/6.0.1xx (#13347)
* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22115.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.2-servicing.22064.8 to 6.0.3-servicing.22115.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22053.6 to 4.0.1-1.22114.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.102 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.102-servicing.22068.7 to 6.0.103-servicing.22116.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22114.6 to 4.0.1-1.22116.5 (parent: Microsoft.NET.Sdk)

 - Remove source-build aspnetcore patch to always build targeting packs because the backported fix is flowing in

* Merged PR 21331: Add runtime patch to reference correct System.Reflection.MetadataLoadContext version

System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build.
In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking
the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion.

* Merged PR 21346: [internal/release/6.0.1xx] 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.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220221.9
- **Date Produced**: February 21, 2022 7:09:27 PM UTC
- **Commit**: 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.103 to 6.0.103][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.103 to 6.0.103][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbecb321&targetVersion=GC3d6f35b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC488cbc4&targetVersion=GC988d95c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 21441: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22121.10 to 6.0.103-servicing.22123.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220224.11
- **Date Produced**: February 24, 2022 8:11:47 PM UTC
- **Commit**: 574686d9d185bd75770481fa76a82a0871210af4
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3]
  - **Microsoft.NETCor...

* Merged PR 21459: [internal/release/6.0.1xx] 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.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220224.18
- **Date Produced**: February 24, 2022 10:36:20 PM UTC
- **Commit**: 36d5c10d65ec7577234f1b72c25e21b9512f1895
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.3 to 6.0.3][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC67f3050&targetVersion=GC36d5c10&_a=files
[2]: https://dev.azure.com/dnceng/intern...

* Update to temp SBRP version.

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
2022-03-09 08:34:39 -06:00
dotnet-maestro[bot]
6cd9dc17f6
[release/6.0.3xx] Update dependencies from dotnet/arcade (#13313)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-08 18:55:29 -06:00
dotnet-maestro[bot]
4d001c3b75
[release/6.0.2xx] Update dependencies from dotnet/arcade (#13314)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-08 18:53:00 -06:00
v-wuzhai
d07a7513c6
Merge pull request #13311 from dotnet/darc-main-4dd4e825-2602-42b3-8871-39df97f569db
[main] Update dependencies from dotnet/sdk
2022-03-07 22:30:07 -08:00
MichaelSimons
3a599e1453 Resolve source-build nuget.client patch conflicts 2022-03-08 03:01:20 +00:00
Marc Paine
c3da28feba
Update 6.0.2xx with the current state of 1xx (#13244)
* Update .vsts-ci.yml

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 (#13179)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

* Override Microsoft.Net.Sdk.WindowsDesktop references during source-build in Roslyn (#13093)

* override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn

* add new EmptySdk in the source build tarball

* remove roslyn solution filter patch

* Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13186)

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [release/6.0.1xx] Windows SDK projection update

* Update asp.net templates (#13193)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220210.1 (#13215)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

* Add test to compare msft and sb sdk contents (#13153)

* Update to SDK and previously-source-built 6.0.102. (#13221)

* Add CentOS Stream 9 container to CI matrix (#12955)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1 (#13229)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

* Gather additional smoke test prereqs (#13233)

* Remove bootstrapping for CI builds now that we use CentOS7 previously-source-built (#13232)

* Update Version.Details.xml

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22151.1 -> To Version 6.0.0-servicing.22153.2

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Omair Majid <omajid@redhat.com>
2022-03-04 20:43:03 -06:00
dotnet-maestro[bot]
0dc1d1a48f
[release/6.0.1xx] Update dependencies from dotnet/arcade (#13312)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-04 19:42:04 -06:00
Marc Paine
c3a19ed0e3 Expand template coverage 2022-03-04 12:47:53 -08:00
MichaelSimons
9b9c22e77d Fix tarball CI condition 2022-03-04 14:10:42 +00:00
Marc Paine
565c3b2885
Merge pull request #13307 from dotnet/marcpopMSFT-CGFixes
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
2022-03-03 11:04:11 -08:00
Daniel Plaisted
d354b6a6e3
Merge pull request #13132 from EgorBo/extend-product-commit-txt
Save runtime commit to productCommit-rid.txt
2022-03-03 08:55:42 -08:00
Michael Simons
3dfda06124
Rewrite smoke-tests.sh in new test framework based smoke tests (#13286) 2022-03-03 08:02:48 -06:00
Djuradj Kurepa
87a7258c1f Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:29:14 -08:00
Djuradj Kurepa
68182c36d0 Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:27:57 -08:00
Marc Paine
b305016c87
Merge pull request #12790 from dotnet/marcpopMSFT-workloadmanifesttxt
Fix the logic that generates the fallback text file
2022-03-02 14:48:26 -08:00
Michael Simons
5e3471b471
Always run sb bootstrap CI leg (#13300) 2022-03-02 15:58:55 -06:00
Michael Simons
ccf17282ea
Update source-build's MsftToSbSdk baseline (#13296) 2022-03-01 19:17:45 -06:00
Michael Simons
e8a47cb304
Remove unused legacy template references from source-build (#13173) 2022-03-01 11:42:54 -06:00
Michael Simons
88bf53f746
Adjust handling of reference packages directory (#13238) 2022-03-01 11:39:47 -06:00
Michael Simons
083549c2e2
Add source-build nowarn for NU1603 (#13289) 2022-02-28 19:38:51 -06:00
Logan Bussell
410b4423d3
Make NuGet.config copy path in source-build CI more explicit (#13265)
* make nuget config path in source build CI more explicit

* add extra brackets to conditional in source build CI to prevent bash syntax error

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-02-25 15:57:48 -08:00
Matt Mitchell
a16c6b7e52
Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300 2022-02-22 14:50:14 -08:00
Logan Bussell
aa3dd86d7f
fix smoke-test authenticated feeds copy and smoke-test logs directory copy (#13255) 2022-02-19 01:03:25 +00:00
MichaelSimons
c099a557b9 Add source-build patch to address arcade bootstrap issue 2022-02-18 15:33:14 +00:00
Logan Bussell
215108835e
[release/6.0.1xx] Add source-build tests for dotnet format (#13207)
* add dotnet format tests

* some updates from code review

* move helper methods out of DotNetFormatTests class

* rearrange smoke test assets

* update various smoke-test paths and remove root repo check from legacy smoke test script

* fix smoke-test-prereqs tar command path

* fix naming conventions and remove extra formatting test

* more refactoring from pr comments

* refactor BaselineHelper comparison methods

* simplify comparison methods

* clarify FormatTest expected result naming

* remove unnecessary empty props and targets files
2022-02-18 08:51:43 -06:00
Marc Paine
b269da2525
Only do signcheck if there are files to sign check 2022-02-17 14:20:45 -08:00
Marc Paine
93495001d5
Remove MAUI manifests for now
MAUI is not yet supported for .net 7 so removing the manifests.
2022-02-17 13:35:54 -08:00
Rahul Bhandari
c4ec1f6724
Create snapcraft.yaml 2022-02-17 10:44:51 -08:00
Chris Rummel
cab7e65d17
Remove bootstrapping for CI builds now that we use CentOS7 previously-source-built (#13232) 2022-02-17 01:05:17 +00:00
Michael Simons
f6763d6f6d
Gather additional smoke test prereqs (#13233) 2022-02-16 15:56:19 -06:00
Omair Majid
35abe3c7cf
Add CentOS Stream 9 container to CI matrix (#12955) 2022-02-15 23:35:05 +00:00
Chris Rummel
606bca49cb
Update to SDK and previously-source-built 6.0.102. (#13221) 2022-02-15 03:12:25 +00:00
Michael Simons
d69361cbcf
Add test to compare msft and sb sdk contents (#13153) 2022-02-10 15:58:01 -06:00
Egor Bogatov
69f4dcf849
Update GenerateBundledVersions.targets 2022-02-10 17:51:44 +03:00
William Godbe
1eace052fc
Update Asp.Net templates (#13195)
* Update Asp.Net templates

* Update GenerateBundledVersions.targets
2022-02-08 16:30:46 -08:00
Sean Reeser
2186b8b250 Merge commit '02d5242ed7ca7c3747fc89196cf67aeff260c6ac' into internal-merge-6.0.1xx-2022-02-08-1019 2022-02-08 10:19:26 -08:00
Logan Bussell
7d14092c5f
Override Microsoft.Net.Sdk.WindowsDesktop references during source-build in Roslyn (#13093)
* override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn

* add new EmptySdk in the source build tarball

* remove roslyn solution filter patch
2022-02-07 09:25:08 -08:00
EgorBo
9469f5c7d1 address feedback 2022-02-05 23:56:28 +03:00
Marc Paine
738f121f8b Merge remote-tracking branch 'ADO/internal/release/6.0.2xx' into darc-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c 2022-02-04 21:03:53 -08:00
Marc Paine
2551ba7164 Merge remote-tracking branch 'ADO/internal/release/6.0.1xx' into darc-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c 2022-02-04 15:32:31 -08:00
Marc Paine
6efd1da62e
Fix up implicit versions 2022-02-04 15:13:25 -08:00
dotnet-bot
477d80b11b Merge in 'release/6.0.1xx' changes 2022-02-04 19:04:34 +00:00
Michael Simons
2842b74fd3
Refactor smoke-test to capture prereqs (#13145) 2022-02-04 12:52:30 -06:00
MichaelSimons
2d05a69434 Resolve source-build nuget patch conflict 2022-02-04 16:59:22 +00:00
Marc Paine
a7d8ea65b7
Switch source build package over to 6.0.200 manifests 2022-02-03 10:21:59 -08:00
Marc Paine
26b2dca100
Updated the runtime manifests 2022-02-03 10:21:04 -08:00
Jonathan Peppers
519c661235 Update manifests for MAUI Preview 13
Insertion: 38aa7894a1
Bump to: xamarin/xamarin-android/release/6.0.2xx-preview13@d23abbd7
Bump to: xamarin/xamarin-macios/release/6.0.2xx-preview13@88f54c5e
Bump to: dotnet/maui/release/6.0.2xx-preview13@8354ef23

The .NET MAUI workload manifests are now 6.0.200. This also uses the
builds we are tentatively shipping for Preview 13.

Note, that I think xamarin-macios had to adjust their version numbers
for other reasons. Their x.x.301 builds should align to 6.0.200.

After `.\build.cmd -pack -publish`, manually tested the workloads:

    > $env:DOTNET_MULTILEVEL_LOOKUP=0
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update
    Installing pack Microsoft.Android.Sdk version 31.0.200-preview.13.41...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update
    Installing pack Microsoft.iOS.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update
    Installing pack Microsoft.MacCatalyst.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update
    Installing pack Microsoft.macOS.Sdk version 12.1.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update
    Installing pack Microsoft.tvOS.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update
    Installing pack Microsoft.Maui.Core.Ref.android version 6.0.200-preview.13.2747...
2022-02-03 10:56:15 -06:00
dotnet-bot
c0cef1d17a Merge in 'release/6.0.1xx' changes 2022-02-03 14:15:24 +00:00
Omair Majid
176600a235
Add arm64 packages to source-build bootstrap (#13157)
Currently, source-build is failing out-of-the-box on arm64 because ilasm
and friends are missing on arm64.

The errors look like this:

src/source-build-reference-packages.4643b750ccc93ca151eed888da70b67f0198d1fd/artifacts/source-build/self/src/src/targetPacks/ILsrc/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.csproj:
error NU1101: Unable to find package
runtime.linux-arm64.microsoft.netcore.ilasm. No packages exist with this
id in source(s): prebuilt, previously-source-built, reference-packages,
source-built
[.dotnet/sdk/6.0.101/NuGet.targets]

Fix this and related errors by ading arm64 artifacts to the bootstrap
step.

This change is sufficient to make source-build work out-of-the-box on
arm64 now using the normal steps:

    ./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=/some/dir
    cd /some/dir
    ./prep.sh --bootstrap && ./build.sh
2022-02-03 08:02:14 -06:00
MichaelSimons
94780438c2 Resolve source-build NuGet.client patch conflict 2022-02-01 16:34:01 +00:00
MichaelSimons
6d6fe7d258 Remove source-build patches that were backported 2022-01-28 01:53:49 +00:00
dotnet-bot
6c72f4c37a Merge in 'release/6.0.1xx' changes 2022-01-27 21:17:36 +00:00
Chris Rummel
15e9018f2a
Updates to produce Microsoft.DotNet.Common.ProjectTemplates.2.1/6.0 in source-build (#13122)
* Updates to produce Microsoft.DotNet.Common.ProjectTemplates.2.1/6.0 in source-build

Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-01-27 15:03:37 -06:00
Egor Bogatov
1dc073731d
Update GetDependencyInfo.cs 2022-01-27 20:19:51 +03:00
EgorBo
8fa51f49e8 Save dependent dotnet/runtime's commit and version to productCommit-rid.txt 2022-01-27 19:21:52 +03:00
dotnet-maestro[bot]
542bf3308b
[main] Update dependencies from dotnet/sdk (#13114)
* Update dependencies from https://github.com/dotnet/sdk build 20220125.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.7

Dependency coherency updates

Microsoft.Build
 From Version 17.2.0-preview-22062-11 -> To Version 17.2.0-preview-22075-03 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220125.11

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.11

Dependency coherency updates

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-secrets,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220125.13

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.13

Dependency coherency updates

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-secrets,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220125.15

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.15

Dependency coherency updates

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.2 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220125.16

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.16

Dependency coherency updates

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.3 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220126.1

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.1

Dependency coherency updates

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.8 (parent: Microsoft.NET.Sdk

* Remove msbuld source-build patches that were backported

* Update dependencies from https://github.com/dotnet/sdk build 20220126.2

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.2

Dependency coherency updates

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.8 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220126.3

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.3

Dependency coherency updates

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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.8 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220126.5

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 7.0.0-preview.2.22075.2 -> To Version 7.0.0-preview.2.22075.11 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-01-26 20:31:28 -06:00
Marc Paine
16f3f632ad
Merge pull request #12981 from dotnet/darc-release/6.0.2xx-804c3b8c-7c2a-4109-a7c2-2d0451821142
[release/6.0.2xx] Update dependencies from dotnet/sdk
2022-01-25 10:56:21 -08:00
MichaelSimons
09bd338105 Resolve source-build patch conflicts 2022-01-25 15:17:59 +00:00
dotnet-bot
8b1c07967c Merge in 'release/6.0.1xx' changes 2022-01-25 04:17:40 +00:00
Michael Simons
3454f6cd99
Source-build tweaks to aid release process (#13101)
* Source-build tweaks to aid release process

* Edit per code review
2022-01-24 21:49:05 -06:00
Marc Paine
babb2cda6e Switching to 7.0 test templates 2022-01-24 10:30:13 -08:00