Commit graph

10153 commits

Author SHA1 Message Date
dotnet-maestro[bot]
18eb0733d1 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220304.3
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22153.2 -> To Version 6.0.0-servicing.22154.3
2022-03-05 01:47:28 +00:00
dotnet-maestro[bot]
86f1e44cd6 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220304.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22153.2 -> To Version 6.0.0-servicing.22154.2
2022-03-05 00:12:13 +00:00
dotnet-maestro[bot]
e2c59875fd 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
2022-03-03 23:14:44 +00:00
Marc Paine
f6de171402
Merge pull request #13294 from vseanreesermsft/branding-6.0.104-2022-03-01-1055
Update branding to 6.0.104
2022-03-02 14:48:03 -08:00
dotnet-maestro[bot]
8535d69714 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22123.1 -> To Version 6.0.0-servicing.22151.1
2022-03-01 19:15:25 +00:00
Sean Reeser
30bbc7d8e3 Update branding to 6.0.104 2022-03-01 10:55:28 -08:00
dotnet-maestro[bot]
d90c8fd6d8 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220223.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22117.5 -> To Version 6.0.0-servicing.22123.1
2022-02-23 16:08:54 +00:00
dotnet-maestro[bot]
73fd7ac601 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.5
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.5
2022-02-18 02:57:43 +00:00
dotnet-maestro[bot]
102421b21d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.1
2022-02-17 16:32:24 +00:00
dotnet-maestro[bot]
e63e925b57
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
2022-02-16 00:07:45 +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
dotnet-maestro[bot]
2f89821757
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
2022-02-10 19:00:35 +00:00
vseanreesermsft
69bd1f865f
Merge pull request #13189 from vseanreesermsft/internal-merge-6.0.1xx-2022-02-08-1019
Merging internal commits for release/6.0.1xx
2022-02-09 10:28:35 -08:00
Marc Paine
b7a97cbabf
Merge pull request #13198 from manodasanW/patch-3
[release/6.0.1xx] Windows SDK projection update
2022-02-08 16:31:33 -08:00
William Godbe
ee9b80739f
Update asp.net templates (#13193) 2022-02-08 16:30:48 -08:00
Manodasan Wignarajah
583dcc4f28
[release/6.0.1xx] Windows SDK projection update 2022-02-08 13:14: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
dotnet-maestro[bot]
b86d04b65d
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>
2022-02-08 08:22:22 -08:00
dotnet-maestro[bot]
97c7aa240b
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
2022-02-07 16:31:47 +00:00
dotnet-maestro[bot]
701b7698d6
Update dependencies from https://github.com/dotnet/arcade build 20220202.3 (#13164)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-02-03 17:55:02 +00:00
dotnet-maestro[bot]
a1c6314717
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13163)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22078.1 -> To Version 6.0.0-servicing.22103.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-02-03 08:42:57 -08:00
vseanreesermsft
041c2d6658
Update branding to 6.0.103 (#13156) 2022-02-01 14:09:57 -08:00
dotnet-maestro[bot]
08df362ca6
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220128.1 (#13142)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-28 15:44:35 +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
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-maestro[bot]
a3c5003a72
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220120.1 (#13090)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-20 15:48:43 +00: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
dotnet-bot
df2d0d6a9b Merge in 'release/6.0.1xx' changes 2022-01-19 16:59:44 +00:00
dotnet-maestro[bot]
ebc698ea6b
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.2 (#13086)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-19 16:58:31 +00:00
dotnet-bot
7736c8aefa Merge in 'release/6.0.1xx' changes 2022-01-19 15:08:02 +00:00
dotnet-maestro[bot]
401e3968d7
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220119.1 (#13084)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-19 15:06:19 +00:00
dotnet-bot
94d5ff8aad Merge in 'release/6.0.1xx' changes 2022-01-14 20:38:04 +00:00
dotnet-maestro[bot]
d31aa165db
Update dependencies from https://github.com/dotnet/test-templates build 20220114.3 (#13051)
[release/6.0.1xx] Update dependencies from dotnet/test-templates
2022-01-14 20:37:03 +00:00
Matt Mitchell
b6928a1799 Merge remote-tracking branch 'upstream/release/6.0.1xx' into internal/release/6.0.1xx 2022-01-13 10:38:55 -08:00
dotnet-maestro[bot]
fbda78a567
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220113.1 (#13025)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-13 15:49:17 +00:00
dotnet-maestro[bot]
351dbd3ecc
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220111.1 (#13007)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-01-12 03:18:18 +00:00
dotnet-maestro[bot]
f67f24dc20 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211216.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.21614.3 -> To Version 6.0.0-alpha.1.21616.1
2021-12-16 15:16:48 +00: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
DotNet Bot
a6432496b0 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-15 02:42:14 +00:00
dotnet-bot
daa5587a85 Merge in 'release/6.0.1xx' changes 2021-12-15 00:04:12 +00:00
dotnet-maestro[bot]
24110c35db
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.3 (#12845)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-15 00:02:06 +00:00
dotnet-bot
16b964c975 Merge in 'release/6.0.1xx' changes 2021-12-14 23:23:33 +00:00
William Godbe
9b9ab15577
Update asp.net template versions (#12764) 2021-12-14 23:22:30 +00:00
dotnet-bot
8df33494b1 Merge in 'release/6.0.1xx' changes 2021-12-14 22:35:54 +00:00
dotnet-maestro[bot]
cad6ba8de3
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12842)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-14 22:34:55 +00:00
dotnet-bot
fd122a4e52 Merge in 'release/6.0.1xx' changes 2021-12-14 19:56:36 +00:00
dotnet-maestro[bot]
4de9f12e2e
Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12837)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2021-12-14 19:55:22 +00: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
DotNet Bot
e88edad0ea [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-14 08:43:37 +00:00