mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
dotnet-installer/eng
History
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
..
BuildConfiguration Add a build retry. 2021-07-09 16:04:27 -07:00
common [release/6.0.1xx] Update dependencies from dotnet/arcade (#13312) 2022-03-04 19:42:04 -06:00
docker [release/6.0.1xx] Update dependencies from dotnet/sdk (#12219) 2021-10-04 13:15:14 +00:00
_prettyprint.sh Attempt to disable pretty print control codes for CI 2018-11-08 00:36:11 -08:00
Build.props Initial checkin of source-build tarball build infrastructure (#10961) 2021-06-24 16:36:04 -05:00
build.yml Changes for internal runtime build support for .NET 6 (#11422) 2021-08-06 13:54:33 -07:00
configure-toolset.ps1 Optional Workload: Finalizer (#10356) 2021-05-04 20:55:39 -07:00
configure-toolset.sh Optional Workload: Finalizer (#10356) 2021-05-04 20:55:39 -07:00
CopyToLatest.cmd Copy latest to blob when all legs succeed. 2018-12-20 13:21:18 -08:00
core-sdk-build-env.sh Add build environment script (with partition support) 2019-08-30 08:53:22 -07:00
core-sdk-test-env.bat Add test environment scripts 2018-11-20 10:10:19 -08:00
core-sdk-test-env.sh Merge branch 'master' into official_builds 2018-12-25 19:08:40 -08:00
dockerrun.ps1 Changes for core-sdk to move to yaml stages 2019-09-12 13:19:14 -07:00
dockerrun.sh Changes for internal runtime build support for .NET 6 (#11422) 2021-08-06 13:54:33 -07:00
Key.snk Get tests and skeleton build tasks building 2018-10-22 19:59:58 -07:00
ManualVersions.props [release/6.0.1xx] Windows SDK projection update 2022-02-08 13:14:46 -08:00
native.proj Optional Workload: Finalizer (#10356) 2021-05-04 20:55:39 -07:00
Publishing.props Use arcade's conditional pattern for publishing (#11172) 2021-07-20 12:33:43 -07:00
restore-toolset.ps1 Fix build environment script 2018-12-30 00:14:04 -08:00
restore-toolset.sh Updating stage0 to 3.0.100-preview-009812 again. This change was lost when we moved to arcade. 2018-12-28 14:15:07 -08:00
sdl-tsa-vars.config Update sdl-tsa-vars.config 2021-05-04 14:47:35 -07:00
SignCheckExclusionsFile.txt Add Sign Check Exclusions from runtime (#11768) (#11772) 2021-08-31 12:29:52 -07:00
Signing.props Update files that should not be signed (#11810) (#11819) 2021-09-02 00:18:20 +00:00
source-build-tarball-build-official.yml Add test to compare msft and sb sdk contents (#13153) 2022-02-10 15:58:01 -06:00
source-build-tarball-build.yml Add test to compare msft and sb sdk contents (#13153) 2022-02-10 15:58:01 -06:00
SourceBuild.props Removing source build patches 2021-05-05 09:30:06 -07:00
SourceBuildPrebuiltBaseline.xml ArPow stage 1: local source-build infrastructure (#10186) 2021-04-16 09:35:26 -05:00
TestVersions.props Remove clicommandlineparser dependency (#9855) 2021-03-02 13:17:32 -08:00
version.csproj Optional Workload: Finalizer (#10356) 2021-05-04 20:55:39 -07:00
Version.Details.xml Merging internal commits for release/6.0.1xx (#13347) 2022-03-09 08:34:39 -06:00
Versions.props Merging internal commits for release/6.0.1xx (#13347) 2022-03-09 08:34:39 -06:00