Commit graph

23718 commits

Author SHA1 Message Date
DotNet Bot
beddbdec0a Merged PR 23696: [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.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22268.6 to 6.0.7-servicing.22321.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22268.5 to 6.0.7-servicing.22314.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22268.6 to 6.0.107-servicing.22315.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.107 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22314.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22268.4 to 6.0.7-servicing.22321.2 (parent:...
2022-06-22 21:39:15 +00:00
Chris Rummel
138bc32cd9
[source-build] [release/6.0.1xx] Additional changes to make the tarball commitable. (#14004)
* Additional changes to make the tarball commitable.
- Add an empty file so an empty packages/prebuilt directory is not removed (NuGet depends on all file sources existing even if empty).
- Use version of source-build-externals with fix for patching in a broken git repo.
- Delete `objects` directory from submodule .gitdirs.

* Enable work-tree and unsafe-paths for repo-level patches to be able to apply in the checked-in tarball.

* Update src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-06-22 20:33:09 +00:00
DotNet Bot
ed49dd9da1 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - NuGet.Build.Tasks: from 6.0.2-rc.3 to 6.0.2-rc.5 (parent: Microsoft.NET.Sdk)
2022-06-22 17:38:16 +00:00
Marc Paine
90d0c5a358
Merge pull request #14010 from dotnet/darc-release/6.0.4xx-544818a4-e09d-4429-b0b6-22da080a8c19
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-22 10:25:31 -07:00
dotnet-maestro[bot]
b67eace3ca Update dependencies from https://github.com/dotnet/sdk build 20220622.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22321.39 -> To Version 6.0.400-preview.22322.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22321.1 -> To Version 12.0.4-beta.22321.5 (parent: Microsoft.NET.Sdk
2022-06-22 09:36:53 +00:00
v-wuzhai
9435781e3f
Merge pull request #14009 from dotnet/darc-release/6.0.4xx-85315a52-b3a0-48a7-b2ec-7ae2deed0029
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-22 01:56:03 -07:00
dotnet-maestro[bot]
47dcdfe275 Update dependencies from https://github.com/dotnet/sdk build 20220621.39
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22321.33 -> To Version 6.0.400-preview.22321.39

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22321.7 -> To Version 4.3.0-3.22321.8 (parent: Microsoft.NET.Sdk
2022-06-22 07:46:52 +00:00
v-wuzhai
e4ca76d47f
Merge pull request #14007 from dotnet/darc-release/6.0.4xx-64985cb9-93ec-4fd6-8c29-b97b6b80be98
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-21 23:29:23 -07:00
dotnet-maestro[bot]
f7e5816c94 Update dependencies from https://github.com/dotnet/sdk build 20220621.33
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22321.19 -> To Version 6.0.400-preview.22321.33

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22320.19 -> To Version 4.3.0-3.22321.7 (parent: Microsoft.NET.Sdk
2022-06-22 04:03:25 +00:00
v-wuzhai
f43d4c3af2
Merge pull request #14006 from dotnet/darc-release/6.0.4xx-6530d57d-d74c-40ec-ba75-8cf8a07c21c2
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-21 18:54:53 -07:00
dotnet-maestro[bot]
07faa7f82b Update dependencies from https://github.com/dotnet/sdk build 20220621.19
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22321.4 -> To Version 6.0.400-preview.22321.19

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22320.5 -> To Version 12.0.4-beta.22321.1 (parent: Microsoft.NET.Sdk
2022-06-21 20:58:32 +00:00
dotnet-maestro[bot]
668680f1fe Update dependencies from https://github.com/dotnet/sdk build 20220621.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22321.4 -> To Version 6.0.400-preview.22321.15

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22320.5 -> To Version 12.0.4-beta.22321.1 (parent: Microsoft.NET.Sdk
2022-06-21 19:14:50 +00:00
dotnet-maestro[bot]
37732f15bb Update dependencies from https://github.com/dotnet/sdk build 20220621.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22321.4 -> To Version 6.0.400-preview.22321.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk
 From Version 12.0.4-beta.22320.5 -> To Version 12.0.4-beta.22321.1 (parent: Microsoft.NET.Sdk
2022-06-21 17:55:22 +00:00
dotnet-maestro[bot]
a5036eb6eb
[release/6.0.4xx] Update dependencies from dotnet/sdk (#14001)
* Update dependencies from https://github.com/dotnet/sdk build 20220620.9

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22320.9

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22320.14

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22320.15

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22321.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks
 From Version 12.0.4-beta.22314.2 -> To Version 12.0.4-beta.22320.5 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22316.3 -> To Version 6.0.400-preview.22321.4

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.Test.Sdk,NuGet.Build.Tasks
 From Version 6.0.400-preview.22309.5 -> To Version 6.0.400-preview.22320.4 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-06-21 09:26:25 -07:00
DotNet Bot
3eff7cb90a Merged PR 23544: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20220614.7
- **Date Produced**: June 14, 2022 8:03:55 PM UTC
- **Commit**: fdd3a242bc813f371023adff4e4c05c0be705d2a
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1]
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22261.7 to 6.0.0-beta.22314.7][1]

[1]: e3cbecc...fdd3a24

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.106

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2022-06-20 22:39:55 +00:00
DotNet Bot
b5e20af6f5 Merged PR 23310: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
This pull request updates the following dependencies

[marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e
- **Build**: 20220614.1
- **Date Produced**: June 15, 2022 1:39:26 AM UTC
- **Commit**: bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22268.1 to 6.0.0-servicing.22314.1][3]

[3]: 8ea40b4...bc3b0a4

[DependencyUpdate]: <> (End)

[marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
2022-06-20 20:28:03 +00:00
dotnet-maestro[bot]
ae695c8600
Update dependencies from https://github.com/dotnet/sdk build 20220616.3 (#13997)
[release/6.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.3.0-preview-20220614-07 to 17.3.0-preview-20220615-12 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.3.0-2.22313.23 to 4.3.0-2.22314.23 (parent: Microsoft.NET.Sdk)
2022-06-16 20:04:13 +00:00
v-wuzhai
ae21ff2e91
Merge pull request #13991 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-06-16 03:06:19 -07:00
dotnet-bot
fa437b12fc Merge in 'release/6.0.3xx' changes 2022-06-16 09:45:45 +00:00
v-wuzhai
edb84895fe
Merge pull request #13992 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-06-16 02:34:35 -07:00
Jason Zhai
096f826167 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-06-16 02:24:38 -07:00
Jason Zhai
0d64bca3ee Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-15 22:53:46 -07:00
dotnet-bot
c91fc8f452 Merge in 'release/6.0.3xx' changes 2022-06-15 23:08:56 +00:00
Chris Rummel
64a3acb5d0
Fixups to make the tarball committable (#13894) (#13995) 2022-06-15 17:56:59 -05:00
Chris Rummel
6f98d9441d
Fixups to make the tarball committable (#13894) (#13994) 2022-06-15 17:56:07 -05:00
Chris Rummel
898bfe7356
Fixups to make the tarball committable (#13894) 2022-06-15 17:52:57 -05:00
dotnet-bot
81132a8d81 Merge in 'release/6.0.3xx' changes 2022-06-15 19:24:51 +00:00
Matt Mitchell
569e5c6ec6
Merge pull request #13968 from vseanreesermsft/internal-merge-6.0.1xx-2022-06-14-1030
Merging internal commits for release/6.0.1xx
2022-06-15 12:15:14 -07:00
Matt Mitchell
75d4c37cea
Merge pull request #13969 from vseanreesermsft/internal-merge-6.0.3xx-2022-06-14-1031
Merging internal commits for release/6.0.3xx
2022-06-15 12:14:59 -07:00
dotnet-maestro[bot]
84746fd13a
Update dependencies from https://github.com/dotnet/sdk build 20220615.3 (#13987)
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-15 17:00:38 +00:00
v-wuzhai
26087cc0f8
Merge pull request #13986 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-06-15 02:46:31 -07:00
dotnet-maestro[bot]
143414c8b6
[release/6.0.4xx] Update dependencies from dotnet/sdk (#13985)
[release/6.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.4-beta.22313.5 to 12.0.4-beta.22314.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.5-beta.22313.5 to 6.0.5-beta.22314.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.3.0-preview-20220613-05 to 17.3.0-preview-20220614-07 (parent: Microsoft.NET.Sdk)
2022-06-15 09:45:47 +00:00
dotnet-bot
9c299bcc8d Merge in 'release/6.0.3xx' changes 2022-06-15 07:02:30 +00:00
v-wuzhai
90d3263120
Merge pull request #13979 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-06-14 23:48:44 -07:00
v-wuzhai
2168013872
Merge pull request #13980 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-06-14 23:44:44 -07:00
NET Source-Build Bot
564757c6a5
.NET Source-Build 6.0.106 June 2022 Updates (#13978)
* update global.json and Versions.props for .NET SDK 6.0.106

* Fix Versions.props

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-06-15 06:07:50 +00:00
Jason Zhai
29c5569f14 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-14 23:04:22 -07:00
Jason Zhai
b007dc974b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-06-14 22:58:53 -07:00
v-wuzhai
ef4c352c92
Merge pull request #13982 from dotnet/darc-release/6.0.1xx-e7e2a401-5a42-485b-927a-257e3456d809
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-06-14 22:40:33 -07:00
v-wuzhai
b2b27d6041
Merge pull request #13983 from dotnet/darc-release/6.0.4xx-1ee5e6cc-743d-4fa0-8da8-860c89867398
[release/6.0.4xx] Update dependencies from dotnet/arcade
2022-06-14 22:39:57 -07:00
v-wuzhai
61febc0ff7
Merge pull request #13984 from dotnet/darc-release/6.0.1xx-2d70cfad-1cbf-4ad7-9851-d1d3fcf05278
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-14 22:39:14 -07:00
v-wuzhai
acb851980d
Merge pull request #13956 from dotnet/darc-release/6.0.4xx-3d1323cf-ba28-4b83-b434-4887ab5fef9d
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-14 22:18:46 -07:00
dotnet-maestro[bot]
3b7c25c763 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:08 +00:00
dotnet-maestro[bot]
e3cd1424a0 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22309.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:02 +00:00
dotnet-maestro[bot]
57d6928a19 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:59:12 +00:00
dotnet-maestro[bot]
353bef46e2 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:48:03 +00:00
dotnet-bot
17ac46f848 Merge in 'release/6.0.3xx' changes 2022-06-14 23:46:23 +00:00
Manodasan Wignarajah
aac14e609b
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13976) 2022-06-14 16:34:46 -07:00
Manodasan Wignarajah
616cfe956e
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13975) 2022-06-14 16:34:39 -07:00
William Godbe
985a087175
Update asp.net templates (#13967) 2022-06-14 16:06:11 -07:00