Commit graph

22803 commits

Author SHA1 Message Date
dotnet-maestro[bot]
e8a1742faf
Update dependencies from https://github.com/dotnet/sdk build 20220328.11 (#13479)
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-28 22:53:58 +00:00
dotnet-maestro[bot]
f5fdfe82e6
Update dependencies from https://github.com/dotnet/sdk build 20220328.8 (#13477)
[release/6.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 17.2.0-preview-22172-04 to 17.2.0-preview-22175-02 (parent: Microsoft.NET.Sdk)
2022-03-28 19:16:00 +00:00
Marc Paine
31dab5cbc8
Merge pull request #13476 from dotnet/darc-release/6.0.3xx-ae657333-9b97-4acc-ab73-649dbfd5a7e2
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-28 11:21:00 -07:00
dotnet-maestro[bot]
717986129d Update dependencies from https://github.com/dotnet/sdk build 20220328.7
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22178.3 -> To Version 6.0.300-preview.22178.7

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22175.4 -> To Version 12.0.3-beta.22176.1 (parent: Microsoft.NET.Sdk
2022-03-28 17:26:05 +00:00
dotnet-maestro[bot]
75b3006c8a
[release/6.0.3xx] Update dependencies from dotnet/sdk (#13455)
* Update dependencies from https://github.com/dotnet/sdk build 20220323.4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.2.0-2.22171.5 -> To Version 4.2.0-2.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.16

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22173.17

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

* Fix test for api change in sdk.

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.11

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22172.6 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22174.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22171.1 -> To Version 12.0.3-beta.22173.1 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.2

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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22175.7

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22175.7 -> To Version 6.0.300-preview.22175.9

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22175.9 -> To Version 6.0.300-preview.22175.12

* 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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22172.2 -> To Version 6.0.300-preview.22178.3

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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22171.2 -> To Version 6.0.300-preview.22174.5 (parent: Microsoft.NET.Sdk

* Remove NuGet.Client source-build patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-28 09:16:59 -07:00
dotnet-maestro-bot
6791ff652b
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx' (#13461)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1

* Update source-build with 6.0.103 artifacts

* Disable public source-build tarball ci (#13377)

* Fix invalid pipeline trigger.

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1

* Update dependencies from https://github.com/dotnet/arcade build 20220309.8

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8

* Remove maui workloads from 6.0.100

The old workloads break MU so we either have to update them or remove them.

* Only do signcheck if there are files to sign check

* Remove template text-only packages which are alread included in source-build (#13380)

* Update dependencies from https://github.com/dotnet/arcade build 20220311.1

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1

* Update source-build MsftToSbSdk.diff baseline (#13400)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1

* [release/6.0.1xx] Windows SDK projection update

* [release/6.0.1xx] dotnet watch smoke test (#13392)

* add dotnet watch smoke test

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Fix issue with BundledTemplates condition

* Make a source-build targetted fix to unblock release

* Refactor build.sh to optimize PackageVersions.props retrieval (#13443)

* Update NuGet path issue in Run Tests CI step (#13453)

* Refactor SdkContentTests to warn on diffs when run in CI (#13432)

* Revert the Versions.props file

* Revert the Versions.props file

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-03-25 09:58:21 -07:00
v-wuzhai
89d0c23a2e
Merge pull request #13452 from dotnet/darc-release/6.0.3xx-4c7c5df1-e72e-4dc5-9fce-ecfc718a3ec9
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-23 02:34:12 -07:00
dotnet-maestro[bot]
3d1b624a88 Update dependencies from https://github.com/dotnet/sdk build 20220322.2
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22171.21 -> To Version 6.0.300-preview.22172.2

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22165.2 -> To Version 12.0.3-beta.22171.1 (parent: Microsoft.NET.Sdk
2022-03-22 11:13:38 +00:00
v-wuzhai
fdc723db25
Merge pull request #13449 from dotnet/darc-release/6.0.3xx-5b6d27f5-8771-4797-8016-bf0699db2a84
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-22 03:01:10 -07:00
dotnet-maestro[bot]
e1a3ae032d Update dependencies from https://github.com/dotnet/sdk build 20220321.21
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.21

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22166.2 -> To Version 6.0.300-preview.22171.2 (parent: Microsoft.NET.Sdk
2022-03-21 23:19:39 +00:00
dotnet-maestro[bot]
7eccbbbf34 Update dependencies from https://github.com/dotnet/sdk build 20220321.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.10
2022-03-21 19:24:03 +00:00
dotnet-maestro[bot]
785ff022a1 Update dependencies from https://github.com/dotnet/sdk build 20220321.8
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.8
2022-03-21 18:15:09 +00:00
Marc Paine
b8d6c48574
Merge pull request #13446 from dotnet/darc-release/6.0.3xx-cd564e94-6d89-4d89-8698-aca8db10add9
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-18 10:52:34 -07:00
dotnet-maestro[bot]
0bdd5cc952 Update dependencies from https://github.com/dotnet/sdk build 20220318.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22167.13 -> To Version 6.0.300-preview.22168.1

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-2.22165.9 -> To Version 4.2.0-2.22167.6 (parent: Microsoft.NET.Sdk
2022-03-18 11:13:08 +00:00
v-wuzhai
e45c7d15e5
Merge pull request #13444 from dotnet/darc-release/6.0.3xx-73538446-acb8-42b6-a0f0-f685b4980e01
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-18 03:01:18 -07:00
dotnet-maestro[bot]
fd8148368c Update dependencies from https://github.com/dotnet/sdk build 20220317.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22166.21 -> To Version 6.0.300-preview.22167.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22164.2 -> To Version 12.0.3-beta.22165.2 (parent: Microsoft.NET.Sdk
2022-03-17 22:18:28 +00:00
dotnet-maestro[bot]
532bd64d19
Update dependencies from https://github.com/dotnet/sdk build 20220316.21 (#13437)
[release/6.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 17.2.0-preview-22165-11 to 17.2.0-preview-22166-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.2.0-preview.2.107 to 6.2.0-preview.2.109 (parent: Microsoft.NET.Sdk)
2022-03-17 12:21:11 +00:00
Marc Paine
df77d499ae
Merge pull request #13427 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-03-16 16:53:45 -07:00
Marc Paine
2647692b78
Merge pull request #13430 from dotnet/darc-release/6.0.3xx-e2cd6255-6e44-4079-9eb4-04ef764573f5
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-16 16:52:53 -07:00
dotnet-maestro[bot]
45a7670092 Update dependencies from https://github.com/dotnet/sdk build 20220316.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.10

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22161.3 -> To Version 6.0.300-preview.22166.2 (parent: Microsoft.NET.Sdk
2022-03-16 22:35:54 +00:00
dotnet-maestro[bot]
5c8b478170 Update dependencies from https://github.com/dotnet/sdk build 20220316.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22161.3 -> To Version 6.0.300-preview.22165.1 (parent: Microsoft.NET.Sdk
2022-03-16 10:50:15 +00:00
dotnet-maestro[bot]
554e3e4578 Update dependencies from https://github.com/dotnet/sdk build 20220316.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.1

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.2.0-preview.2.91 -> To Version 6.2.0-preview.2.107 (parent: Microsoft.NET.Sdk
2022-03-16 09:35:19 +00:00
v-wuzhai
831a58ef30
Merge pull request #13429 from dotnet/darc-release/6.0.3xx-0de56aa1-ec85-4074-b932-2929a3c1bd27
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-16 02:18:20 -07:00
dotnet-maestro[bot]
15675c82df Update dependencies from https://github.com/dotnet/sdk build 20220315.29
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.4 -> To Version 6.0.300-preview.22165.29

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-2.22159.10 -> To Version 4.2.0-2.22165.9 (parent: Microsoft.NET.Sdk
2022-03-16 07:24:02 +00:00
Marc Paine
e4032f3cc3
Merge pull request #13420 from dotnet/darc-release/6.0.3xx-917cef8e-b735-4fb9-bb4d-0c2582b8d860
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-15 13:46:24 -07:00
Marc Paine
4938a371ec
Merge pull request #13425 from manodasanW/patch-4
[release/6.0.2xx] Windows SDK projection update
2022-03-15 10:59:26 -07:00
Manodasan Wignarajah
7dbbf21923
[release/6.0.2xx] Windows SDK projection update 2022-03-15 09:25:17 -07:00
dotnet-maestro[bot]
9fd1cb9959 Update dependencies from https://github.com/dotnet/sdk build 20220315.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.4

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 12.0.3-beta.22161.4 -> To Version 12.0.3-beta.22164.2 (parent: Microsoft.NET.Sdk
2022-03-15 09:54:10 +00:00
dotnet-maestro[bot]
75bdbcd4e1 Update dependencies from https://github.com/dotnet/sdk build 20220315.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.1
2022-03-15 08:47:11 +00:00
v-wuzhai
bfe04f5150
Merge pull request #13416 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-03-15 01:02:11 -07:00
v-wuzhai
f46f04d56a
Merge pull request #13415 from dotnet/darc-release/6.0.3xx-f56a538c-e7a5-4b4e-a48b-ddd77ddb167d
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-15 01:01:16 -07:00
Jason Zhai
afd76b47f4 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-15 00:01:35 -07:00
dotnet-maestro[bot]
681bebd311 Update dependencies from https://github.com/dotnet/sdk build 20220314.17
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.17
2022-03-14 23:55:32 +00:00
Marc Paine
6a8cc38b66
Merge pull request #13417 from dotnet/marcpopMSFT-fixduplicatepackages
Revert prior templatelocator and msbuildextension changes as they weren't required
2022-03-14 16:50:06 -07:00
Marc Paine
ab3ddec440 Revert prior changes as only the first and last change were actually needed. 2022-03-14 14:27:34 -07:00
dotnet-maestro[bot]
a882615ccd
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 (#13409)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:26:07 -07:00
dotnet-maestro[bot]
a2621d473d
Update dependencies from https://github.com/dotnet/arcade build 20220311.1 (#13405)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:24:26 -07:00
dotnet-maestro[bot]
b054be41f9 Update dependencies from https://github.com/dotnet/sdk build 20220314.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.6
2022-03-14 20:14:02 +00:00
v-wuzhai
4969ceaeee
Merge pull request #13413 from dotnet/darc-release/6.0.3xx-58f749c3-a750-4f1f-bec8-24a95951a3ff
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-14 01:07:32 -07:00
dotnet-maestro[bot]
d10705cf90 Update dependencies from https://github.com/dotnet/sdk build 20220313.5
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.14 -> To Version 6.0.300-preview.22163.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22161.2 -> To Version 12.0.3-beta.22161.4 (parent: Microsoft.NET.Sdk
2022-03-14 06:57:01 +00:00
v-wuzhai
61e6adbc39
Merge pull request #13403 from dotnet/darc-release/6.0.3xx-3b54c85c-cc7f-491b-8592-7a98c5acb747
[release/6.0.3xx] Update dependencies from dotnet/arcade
2022-03-13 22:40:02 -07:00
v-wuzhai
22be0e23d2
Merge pull request #13406 from dotnet/darc-release/6.0.3xx-7d762506-e7c8-49ef-b540-d2c131d77a7d
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-13 22:39:24 -07:00
v-wuzhai
41336c3545
Merge pull request #13408 from dotnet/darc-release/6.0.3xx-c85a0547-bf78-4a6b-a942-5ef1255675a0
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-13 22:37:51 -07:00
Marc Paine
2d5f6fc8bd
Add additional hostfxr versions (#13404)
* Update the nuspec as well to remove the duplicates

* Add additional architecture
2022-03-11 18:57:30 -08:00
dotnet-maestro[bot]
dd6a10fb45 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1
2022-03-12 02:56:19 +00:00
dotnet-maestro[bot]
436178eccf Update dependencies from https://github.com/dotnet/sdk build 20220311.14
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.10 -> To Version 6.0.300-preview.22161.14
2022-03-12 02:43:56 +00:00
dotnet-maestro[bot]
74901ba760 Update dependencies from https://github.com/dotnet/sdk build 20220311.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.10 -> To Version 6.0.300-preview.22161.13
2022-03-12 01:27:23 +00:00
Marc Paine
37f553ace2 Add additional architecture 2022-03-11 16:49:39 -08:00
dotnet-maestro[bot]
dbc11b81b3 Update dependencies from https://github.com/dotnet/arcade build 20220311.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1
2022-03-12 00:46:20 +00:00
Marc Paine
fcd74519d7 Merge branch 'marcpopMSFT-fixduplicatepackages' of https://github.com/dotnet/installer into marcpopMSFT-fixduplicatepackages 2022-03-11 16:45:24 -08:00