Commit graph

22803 commits

Author SHA1 Message Date
dotnet-maestro[bot]
27af8051bc Update dependencies from https://github.com/dotnet/sdk build 20220308.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22157.14 -> To Version 6.0.300-preview.22158.21

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22153.2 -> To Version 6.0.300-preview.22158.11 (parent: Microsoft.NET.Sdk
2022-03-09 01:27:31 +00: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
dotnet-maestro[bot]
c04f96501d Update dependencies from https://github.com/dotnet/sdk build 20220308.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22157.14 -> To Version 6.0.300-preview.22158.16
2022-03-08 22:55:53 +00:00
Sean Reeser
c02fbf750b Merge commit 'ef40e6aa06a366313f36e1eb80290498a5ed27c8' into internal-merge-6.0.2xx-2022-03-08-1137 2022-03-08 11:37:45 -08:00
dotnet-maestro[bot]
720832be9c
Update dependencies from https://github.com/dotnet/sdk build 20220307.14 (#13339)
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22157.12 -> To Version 6.0.300-preview.22157.14

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-08 10:23:24 -08:00
v-wuzhai
f790c782c5
Merge pull request #13338 from dotnet/darc-release/6.0.3xx-76743f19-f4c3-4e9b-8637-c5483791f29a
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-07 20:41:53 -08:00
dotnet-maestro[bot]
13038443bd Update dependencies from https://github.com/dotnet/sdk build 20220307.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22157.1 -> To Version 6.0.300-preview.22157.12

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.2.0-preview.2.80 -> To Version 6.2.0-preview.2.91 (parent: Microsoft.NET.Sdk
2022-03-08 03:49:48 +00:00
Marc Paine
2a82527871
Merge pull request #13333 from dotnet/darc-release/6.0.3xx-db60d053-8da9-4527-b99e-9a493c2872a6
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-07 12:41:54 -08:00
dotnet-maestro[bot]
e3b515f73e Update dependencies from https://github.com/dotnet/sdk build 20220307.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22154.11 -> To Version 6.0.300-preview.22157.1

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 6.0.300-preview.22126.1 -> To Version 6.0.300-preview.22153.2 (parent: Microsoft.NET.Sdk
2022-03-07 10:07:07 +00:00
dotnet-maestro[bot]
04caf3cccc Update dependencies from https://github.com/dotnet/sdk build 20220306.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22154.11 -> To Version 6.0.300-preview.22156.7

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 6.0.300-preview.22126.1 -> To Version 6.0.300-preview.22153.2 (parent: Microsoft.NET.Sdk
2022-03-07 08:50:22 +00:00
dotnet-maestro[bot]
ed62baa5cf Update dependencies from https://github.com/dotnet/sdk build 20220306.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22154.11 -> To Version 6.0.300-preview.22156.5

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 6.0.300-preview.22126.1 -> To Version 6.0.300-preview.22153.2 (parent: Microsoft.NET.Sdk
2022-03-07 07:39:55 +00:00
v-wuzhai
e7975f2e5e
Merge pull request #13329 from dotnet/darc-release/6.0.3xx-65ea35b4-783a-4781-8153-3de2e9f3ae95
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-06 22:32:55 -08:00
v-wuzhai
88cdf93a29
Merge pull request #13330 from dotnet/darc-release/6.0.2xx-4c7eb8f6-3690-4a6d-8775-0c3187a38d17
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-06 22:32:13 -08:00
v-wuzhai
3406156f6c
Merge pull request #13331 from dotnet/darc-release/6.0.1xx-1244345e-ad0a-4223-9a50-ff4a7de39119
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-06 22:31:33 -08:00
v-wuzhai
677caf9657
Merge pull request #13332 from dotnet/darc-release/6.0.3xx-ae3e99f2-2d7e-46dd-8c2b-eb7b186776ca
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-06 22:30:44 -08:00
dotnet-maestro[bot]
8a1feb15b7 Update dependencies from https://github.com/dotnet/sdk build 20220304.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22153.30 -> To Version 6.0.300-preview.22154.11
2022-03-05 04:15:28 +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]
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]
da93cebfe2 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.22151.1 -> To Version 6.0.0-servicing.22154.3
2022-03-05 01:47:24 +00: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
28ed04e333
Merge pull request #13326 from dotnet/marcpopMSFT-templates
Expand template coverage
2022-03-04 17:36:25 -08: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]
f63e028333 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:11 +00:00
dotnet-maestro[bot]
6737d8c508 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.22151.1 -> To Version 6.0.0-servicing.22154.2
2022-03-05 00:12:07 +00:00
Marc Paine
c3a19ed0e3 Expand template coverage 2022-03-04 12:47:53 -08:00
Marc Paine
1eb22793b6
Merge pull request #13324 from dotnet/darc-release/6.0.3xx-637b7597-988e-4a08-9770-087d2472a54b
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-04 10:24:14 -08:00
Marc Paine
090668da98
Merge pull request #13295 from vseanreesermsft/branding-6.0.202-2022-03-01-1055
Update branding to 6.0.202
2022-03-04 09:58:13 -08:00
Chris Rummel
d96bce98ce
Merge pull request #13323 from MichaelSimons/tarball-ci
Fix tarball CI condition
2022-03-04 11:46:45 -06:00
dotnet-maestro[bot]
281a4fa189 Update dependencies from https://github.com/dotnet/sdk build 20220303.30
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22125.1 -> To Version 6.0.300-preview.22153.30

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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22122.2 -> To Version 6.0.300-preview.22126.1 (parent: Microsoft.NET.Sdk
2022-03-04 17:18:09 +00:00
Marc Paine
027567b88b
Remove coherency requirement 2022-03-04 09:17:00 -08:00
MichaelSimons
9b9c22e77d Fix tarball CI condition 2022-03-04 14:10:42 +00:00
v-wuzhai
4148f064b0
Merge pull request #13319 from dotnet/darc-release/6.0.1xx-e3fbbc0b-0a58-441f-879b-2baa99b26c2d
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-04 12:25:42 +08:00
v-wuzhai
2d8034134f
Merge pull request #13228 from dotnet/darc-release/6.0.2xx-c4c73741-470d-4e92-aabd-a4c047629eb4
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-04 11:08:57 +08:00
dotnet-maestro[bot]
abe53ee3e3 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.22110.1 -> To Version 6.0.0-servicing.22153.2
2022-03-03 23:14:49 +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
b5faf4fbfa
Merge pull request #13236 from dotnet/marcpopMSFT-catchup60300
Merge 6.0.200 into 6.0.3xx
2022-03-03 14:08:15 -08: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
Marc Paine
1e1a69ca34
Merge pull request #13308 from dotnet/marcpopMSFT-CGFixes602
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
2022-03-03 11:04:07 -08:00
Marc Paine
65c3392c68
Fix the version stabilization merge 2022-03-03 11:03:28 -08:00
Marc Paine
f37dbb8764
Fix some downgrades in the version details 2022-03-03 11:03:02 -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
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
Michael Simons
5e3471b471
Always run sb bootstrap CI leg (#13300) 2022-03-02 15:58:55 -06:00
Matt Mitchell
20fb83d5f4
Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300 2022-03-02 11:29:43 -08:00
v-wuzhai
f87228ef9c
Merge pull request #13298 from dotnet/darc-release/6.0.1xx-0dff2ed3-557d-4859-916c-843dc46ccf60
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-02 13:41:55 +08:00
v-wuzhai
c5b0a4598d
Merge pull request #13297 from dotnet/darc-release/6.0.3xx-3d838e82-6c96-4cca-aa52-a582a663ff80
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-02 12:22:33 +08:00