Commit graph

4369 commits

Author SHA1 Message Date
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
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
Djuradj Kurepa
87a7258c1f Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:29:14 -08: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
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
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
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
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
dotnet-bot
d3374f5847 Merge in 'release/6.0.1xx' changes 2022-01-21 14:13:34 +00:00
Michael Simons
0dec528400
Implement beginnings of C# based tests (#13052)
* Implement beginnings of C# based tests

* Convert xml dox tests

* Updates per code review

* Fixup of previous commit

* Edits per code review

* Refactor testRunTitle to make distinguishable between build legs
2022-01-21 07:59:36 -06:00
dotnet-bot
30bae2948f Merge in 'release/6.0.1xx' changes 2022-01-20 20:42:24 +00:00
Michael Simons
b9540d3005
Remove unnecessary Arcade bootstrap patch (#13092) 2022-01-20 14:28:22 -06:00
dotnet-bot
746ca1351c Merge in 'release/6.0.1xx' changes 2022-01-20 16:02:36 +00:00
Michael Simons
4a1e7f6238
Update source-build toolset and artifacts to 6.0.1 (#12860)
* Update source-build toolset and artifacts to 6.0.1

* Update PrivateSourceBuiltArtifactsPackageVersion
2022-01-20 09:58:43 -06:00
dotnet-bot
6771a8632c Merge in 'release/6.0.1xx' changes 2022-01-20 15:33:32 +00:00
Omair Majid
3e4f44cf23
Include musl bits in source-build bootstrap tarball (#13076) 2022-01-20 09:20:36 -06:00
DotNet Bot
02d5242ed7 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Resolve source-build patch conflicts

 - Remove source-build runtime patch that was backported

 - Merge branch 'internal/release/6.0.1xx' of https://dnceng.visualstudio.com/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679

 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9

 - Download bits from dotnetbuilds/internal

 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9

 - Merge remote-tracking branch 'dnceng/internal/release/6.0.1xx' into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679
2022-01-19 18:34:20 +00:00
Michael Simons
a22825a1ff
Add runtime and aspnetcore patches to always build libs, app.ref and targetting packs (#13009)
* Add runtime patch to build all packages during source-build

* Add aspnetcore patch to always build App.Ref and targeting packs
2022-01-19 07:47:28 -06:00
Matt Mitchell
9092e6a3c4
Merge pull request #13077 from MichaelSimons/internal-clone
Add additional clause in ConvertInternalRepos condition
2022-01-18 21:47:56 -08:00
MichaelSimons
5846bfe682 Add additional clause in ConvertInternalRepos condition 2022-01-19 00:42:46 +00:00
Alexander Köplinger
ee7e6073f4 Revert "Resolve msbuild source-build patch conflict"
This reverts commit 4b41693115.

We need the previous version after https://github.com/dotnet/sdk/pull/23421 was merged which downgraded msbuild back to the correct version.
2022-01-17 19:11:04 +01:00
MichaelSimons
51a0225f80 Tweak source-build tarball build logic to skip offline in PR 2022-01-14 00:15:19 +00:00
Marc Paine
d7821d002e
Merge branch 'release/6.0.2xx' into marcpopMSFT-merge601xx 2022-01-13 14:18:00 -08:00
Marc Paine
6f0f80e3aa
Update GenerateBundledVersions.targets 2022-01-13 14:08:42 -08:00
MichaelSimons
80ac870557 Remove linker source-build patches that were backported 2022-01-11 14:25:47 +00:00
Daniel Plaisted
0d3f10e495
Merge pull request #12987 from dsplaisted/fix-installertype-location
Fix installertype path for patches
2022-01-10 16:58:14 -08:00
MichaelSimons
fbfe33b3f0 Revert "Remove linker source-build patches that were backported."
This reverts commit 2ce908597d.
2022-01-10 19:53:27 +00:00
MichaelSimons
4b41693115 Resolve msbuild source-build patch conflict 2022-01-10 15:07:03 +00:00
MichaelSimons
2ce908597d Remove linker source-build patches that were backported. 2022-01-10 14:59:27 +00:00
Daniel Plaisted
b00ba9b79e Fix installertype path for patches 2022-01-06 17:46:04 -08:00
MichaelSimons
557fa0dc0d Remove source-build format repo patches that were backported 2022-01-06 17:06:09 +00:00
dotnet-maestro[bot]
58f9685dd5
[release/6.0.2xx] Update dependencies from dotnet/sdk (#12857)
* Update dependencies from https://github.com/dotnet/sdk build 20211216.6

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.6

Dependency coherency updates

VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.8

Dependency coherency updates

VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.10

Dependency coherency updates

VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk

* Add logic to convert internal repo uris in version.details.xml (#12852)

* Add logic to convert internal repo uris in version.details.xml

* code review updates

* Remove source-build patches that we backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2021-12-17 14:34:47 -06:00
Michael Simons
f14e400349
Exclude omnisharp tests from CentOS 7 CI (#12858)
* Exclude omnisharp tests from CentOS 7 CI

* Update src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml

Co-authored-by: Chris Rummel <crummel@microsoft.com>

Co-authored-by: Chris Rummel <crummel@microsoft.com>
2021-12-17 14:30:05 -06:00
Michael Simons
586476f7e5
Add logic to convert internal repo uris in version.details.xml (#12852)
* Add logic to convert internal repo uris in version.details.xml

* code review updates
2021-12-16 18:45:17 -06:00
Matt Mitchell
f58d51e6ae
Merging internal commits for release/6.0.1xx (#12827)
* Support source-build tarball creation w/internal repos

* Merged PR 19846: [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.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (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**: 20211115.9
- **Date Produced**: November 15, 2021 7:50:53 PM UTC
- **Commit**: 7aff324297b3853a1cb198f92ec20f6bae9e2de5
- **Branch**: r...

* Merged PR 19997: [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.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (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**: 20211118.7
- **Date Produced**: November 18, 2021 8:11:25 PM UTC
- **Commit**: a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.0 to 6.0.0][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0de2b2e&targetVersion=GCa35d9cf&_a=files
[2]: ac655f0...59fea7d
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCac655f0&targetVersion=GCef15b55&_a=files

[DependencyUpdate]: <> (End)

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

* Merged PR 20001: [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.Net.Compilers.Toolset**: from 4.0.0-6.21526.21 to 4.0.1-1.21568.1 (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**: 20211118.11
- **Date Produced**: November 18, 2021 10:53:09 PM UTC
- **Commit**: 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.0.0-6.21526.21 to 4.0.1-1.21568.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa35d9cf&targetVersion=GC95eaa4d&_a=files
[2]: c7d6f9f...6ab6601

[DependencyUpdate]: <> (End)

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

* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21569.2 (parent: Microsoft.NET.Sdk)

Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
2021-12-15 16:21:31 -08:00
Michael Simons
1b7269474c
Update build logic to handle checked in project.assets.json file in NuGet repo (#12810) 2021-12-14 19:23:41 -06:00
Michael Simons
0c8aa6d7a9
Clean prebuilt baseline (#12816)
* Remove prebuilt baseline

* Make prebuilt baseline file optional
2021-12-14 19:23:15 -06:00
Omair Majid
4e9a0b6434
[release/6.0.1xx] Add some additional distros to the CI matrix (#12141) 2021-12-14 16:29:29 -06:00
Marc Paine
2e29acc142 Fix the logic that generates the fallback text file 2021-12-14 10:40:55 -08:00
Sean Reeser
2c5af44dde Merge commit 'ef49f6213a0256d5e8b10d9a573f8dd355bc8593' into internal-merge-6.0.1xx-2021-12-14-0946 2021-12-14 09:46:54 -08:00