Commit graph

22654 commits

Author SHA1 Message Date
v-wuzhai
0e4e3d1414
Merge pull request #13272 from dotnet/darc-release/6.0.1xx-aeb6ce39-78fe-4226-9b8e-db23823b4c18
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-24 10:29:29 +08:00
dotnet-maestro[bot]
694b7a52ec 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.22110.1 -> To Version 6.0.0-servicing.22123.1
2022-02-23 16:09:02 +00: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 Bot
279043cdd7 Merged PR 21347: [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.DotNet.Common.ItemTemplates**: from 6.0.200 to 6.0.201 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22116.10 to 6.0.201-servicing.22120.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.201 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220221.8
- **Date Produced**: February 21, 2022 7:13:06 PM UTC
- **Commit**: 2380bdfc9ac7b9d6af1a42eacb296b729c8fcd80
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.201-servicing.22121.5 to 6.0.201-servicing.22121.8][1]
  - **Microsoft.NET.Sdk**: [from 6.0.201-servicing.22121.5 to 6.0.201-servicing.22121.8][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.200 to 6.0.201][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.200-rtm.22116.10 to 6.0.201-servicing.22120.1][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.200 to 6.0.201][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1a8eb3b&targetVersion=GC2380bdf&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5a191c3&targetVersion=GCa4fcd0c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)
2022-02-21 20:14:38 +00:00
DotNet Bot
8b121c8865 [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.1.0-5.22114.11 to 4.1.0-5.22116.13 (parent: Microsoft.NET.Sdk)
2022-02-21 18:55:59 +00: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
Jason Zhai
2bd864a550 Merge branch 'release/6.0.2xx' of https://github.com/dotnet/installer into darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4 2022-02-17 23:59:48 -08:00
v-wuzhai
971f5ae3ae
Merge pull request #13241 from dotnet/darc-release/6.0.1xx-aaab3a90-c0e7-4ed7-bd01-4130ec9fe029
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-18 14:04:20 +08:00
dotnet-maestro[bot]
7581d57850 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.22110.1 -> To Version 6.0.0-servicing.22117.5
2022-02-18 06:04:10 +00:00
Jason Zhai
7160c3de98 Merge branch 'release/6.0.2xx' of https://github.com/dotnet/installer into darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4 2022-02-17 21:58:31 -08: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 Bot
5ff8e00aaf Merged PR 21263: [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.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.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.200 to 6.0.200 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22103.10 to 6.0.200-rtm.22116.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.200 (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: Micr...
2022-02-17 19:12:35 +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]
332641837a 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.22110.1 -> To Version 6.0.0-servicing.22117.1
2022-02-17 16:32:23 +00: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
Jason Zhai
ec79e28c68 Update NuGet.config 2022-02-16 01:47:06 -08:00
dotnet-bot
e675224a08 Merge in 'release/6.0.2xx' changes 2022-02-16 00:39:33 +00:00
Marc Paine
2d6f118ce1
Merge pull request #13203 from vseanreesermsft/internal-merge-6.0.2xx-2022-02-08-1606
Merging internal commits for release/6.0.2xx
2022-02-15 16:26:27 -08: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
Omair Majid
35abe3c7cf
Add CentOS Stream 9 container to CI matrix (#12955) 2022-02-15 23:35:05 +00:00
dotnet-maestro[bot]
e4b6870146 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22110.1 -> To Version 6.0.0-servicing.22115.1
2022-02-15 15:59:20 +00:00
Chris Rummel
606bca49cb
Update to SDK and previously-source-built 6.0.102. (#13221) 2022-02-15 03:12:25 +00:00
dotnet-bot
55dd834d19 Merge in 'release/6.0.2xx' changes 2022-02-11 21:59:09 +00:00
Marc Paine
eb482966af
Merge pull request #13199 from manodasanW/patch-4
[release/6.0.2xx] Windows SDK projection update
2022-02-11 13:47:56 -08:00
dotnet-bot
75f198d70e Merge in 'release/6.0.2xx' changes 2022-02-11 16:26:14 +00:00
dotnet-maestro[bot]
1a8edd6415
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13213)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages


 - Update NuGet.config
2022-02-11 16:14:00 +00:00
Michael Simons
d69361cbcf
Add test to compare msft and sb sdk contents (#13153) 2022-02-10 15:58:01 -06:00
dotnet-bot
d63d4ba532 Merge in 'release/6.0.2xx' changes 2022-02-10 21:26:32 +00:00
Marc Paine
83352f6494
Merge pull request #13202 from dotnet/marcpopMSFT-servicingBranding
6.0.201 servicing branding
2022-02-10 13:15:02 -08: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
dotnet-bot
e40a172d20 Merge in 'release/6.0.2xx' changes 2022-02-09 15:27:18 +00:00
dotnet-maestro[bot]
080205a5d9
[release/6.0.2xx] Update dependencies from dotnet/arcade (#13188)
[release/6.0.2xx] Update dependencies from dotnet/arcade


 - Update NuGet.config
2022-02-09 15:16:14 +00:00
dotnet-bot
7ce69e6b06 Merge in 'release/6.0.2xx' changes 2022-02-09 00:42:25 +00: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
f13c273745
Update asp.net templates (#13194) 2022-02-08 16:30:48 -08:00
William Godbe
ee9b80739f
Update asp.net templates (#13193) 2022-02-08 16:30:48 -08:00
Sean Reeser
230eb5ce60 Merge commit '4c30de7899a11b05875df6d6a672d44d03789b5e' into internal-merge-6.0.2xx-2022-02-08-1606 2022-02-08 16:06:38 -08:00
Marc Paine
b2eed32257
Update Versions.props 2022-02-08 16:03:45 -08:00
Manodasan Wignarajah
ea4be9c1a7
[release/6.0.2xx] Windows SDK projection update 2022-02-08 13:15: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
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
dotnet-bot
5b92cf4771 Merge in 'release/6.0.2xx' changes 2022-02-07 16:43:57 +00:00
dotnet-maestro[bot]
c506cfba13
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#13177)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22103.1 -> To Version 6.0.0-servicing.22105.1

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-02-07 08:32:20 -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