Jason Zhai
5b3fdeda69
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2022-09-15 19:39:44 -07:00
dotnet-bot
95d8446e1c
Merge in 'release/6.0.3xx' changes
2022-09-15 19:29:07 +00:00
Matt Mitchell
5f257aebc3
Merge pull request #14480 from vseanreesermsft/internal-merge-6.0.3xx-2022-09-13-1003
...
Merging internal commits for release/6.0.3xx
2022-09-15 12:18:55 -07:00
dotnet-bot
555ec51be2
Merge in 'release/6.0.4xx' changes
2022-09-15 07:10:43 +00:00
v-wuzhai
1c38151cab
Merge pull request #14502 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-09-14 23:59:02 -07:00
Jason Zhai
f6029750a6
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2022-09-14 19:25:04 -07:00
dotnet-bot
2fd6a1cad7
Merge in 'release/6.0.1xx' changes
2022-09-14 21:48:28 +00:00
dotnet-bot
9b9de1068e
Merge in 'release/6.0.4xx' changes
2022-09-14 21:47:48 +00:00
Matt Mitchell
437a3088ea
Merge branch 'release/6.0.3xx' into internal-merge-6.0.3xx-2022-09-13-1003
2022-09-14 14:45:49 -07:00
Matt Mitchell
ed966db67a
Merge pull request #14497 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-09-14 14:44:54 -07:00
Matt Mitchell
b5f732e4b5
Merge pull request #14481 from vseanreesermsft/internal-merge-6.0.1xx-2022-09-13-1003
...
Merging internal commits for release/6.0.1xx
2022-09-14 14:38:45 -07:00
dotnet-maestro[bot]
934d6b31df
Update dependencies from https://github.com/dotnet/arcade build 20220913.7 ( #14498 )
...
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-14 14:36:42 -07:00
dotnet-maestro[bot]
5364e129c0
Update dependencies from https://github.com/dotnet/arcade build 20220913.7 ( #14499 )
...
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-14 14:36:17 -07:00
dotnet-bot
e798816339
Merge in 'release/6.0.4xx' changes
2022-09-14 19:44:11 +00:00
Marc Paine
2138fc1031
Merge pull request #14496 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-09-14 12:32:48 -07:00
Marc Paine
c50431e473
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx
2022-09-14 12:31:35 -07:00
DotNet-Bot
62d0b8c97f
Update dependencies from https://github.com/dotnet/arcade build 20220913.7
...
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7
2022-09-14 19:03:04 +00:00
DotNet Bot
af8afbac84
Merged PR 25460: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
...
This pull request updates the following dependencies
[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220914.21
- **Date Produced**: September 14, 2022 3:41:14 PM UTC
- **Commit**: 2336f3adc98fface4160b2265684b302bf642fbd
- **Branch**: refs/heads/internal/release/6.0.3xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.304-servicing.22421.4 to 6.0.305-servicing.22464.21][8]
- **Microsoft.NET.Sdk**: [from 6.0.304-servicing.22421.4 to 6.0.305-servicing.22464.21][8]
- **NuGet.Build.Tasks**: [from 6.2.1-rc.7 to 6.2.2-rc.1][9]
[8]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC092f7d6&targetVersion=GC2336f3a&_a=files
[9]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GC4be14ee&targetVersion=GC027ca8b&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
[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**:
- **NuGet.Build.Tasks**: from 6.2.1-rc.7 to 6.2.2-rc.1 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
2022-09-14 18:48:27 +00:00
dotnet-bot
7e396a08f7
Merge in 'release/6.0.1xx' changes
2022-09-14 17:14:37 +00:00
dotnet-bot
cdc80ef9ae
Merge in 'release/6.0.3xx' changes
2022-09-14 17:12:59 +00:00
dotnet-bot
570874738b
Merge in 'release/6.0.4xx' changes
2022-09-14 17:11:58 +00:00
Doug Bunting
d42f27ecbe
[6.0.1xx] Update template versions from dotnet/aspnetcore ( #14485 )
2022-09-14 10:00:30 -07:00
Doug Bunting
a5a36d4af5
[6.0.3xx] Update template versions from dotnet/aspnetcore ( #14486 )
2022-09-14 10:00:19 -07:00
Doug Bunting
ed6ae3ed1e
[6.0.4] Update template versions from dotnet/aspnetcore ( #14487 )
2022-09-14 10:00:10 -07:00
DotNet-Bot
952fd4a43a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220914.21
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21
Dependency coherency updates
NuGet.Build.Tasks
From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk
2022-09-14 16:08:36 +00:00
dotnet-bot
cfc0f130dc
Merge in 'release/6.0.1xx' changes
2022-09-14 04:00:44 +00:00
NET Source-Build Bot
f9c278be33
.NET Source-Build 6.0.109 September 2022 Updates ( #14482 )
...
* update global.json and Versions.props for .NET SDK 6.0.109
* Use re-uploaded SB artifacts tarball version
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-09-14 03:50:12 +00:00
DotNet-Bot
b45ac4a743
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.41
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41
2022-09-14 00:56:34 +00:00
DotNet-Bot
05ac09da1c
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.34
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34
2022-09-13 23:54:36 +00:00
dotnet-bot
eb1d52b430
Merge in 'release/6.0.4xx' changes
2022-09-13 22:49:56 +00:00
Marc Paine
5707f80e81
Merge pull request #14479 from vseanreesermsft/internal-merge-6.0.4xx-2022-09-13-1003
...
Merging internal commits for release/6.0.4xx
2022-09-13 15:37:52 -07:00
Daniel Plaisted
af7672089f
Merged PR 25723: use mktemp to correctly use temp files
...
Apply https://dev.azure.com/dnceng/internal/_git/dotnet-installer/pullrequest/24828 to 6.0.4xx
2022-09-13 22:09:00 +00:00
Sean Reeser
24feaa10a1
Merge commit '58a93139d80490d0724b4d862ba8ee00ceae45d3' into internal-merge-6.0.1xx-2022-09-13-1003
2022-09-13 10:03:50 -07:00
Sean Reeser
1fdee73365
Merge commit 'd61314894c0fdcdb6e9d9c9f1ff5f8a483570d33' into internal-merge-6.0.3xx-2022-09-13-1003
2022-09-13 10:03:41 -07:00
Sean Reeser
2115855cf9
Merge commit '0906eae6f8c72882c197e346b9125f0b69c4b3a7' into internal-merge-6.0.4xx-2022-09-13-1003
2022-09-13 10:03:32 -07:00
73436261e3
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516 )
2022-09-13 09:20:55 -04:00
Noah Gilson
be85081b6f
use mktemp to correctly use temp files
2022-09-12 21:35:42 -04:00
DotNet-Bot
4ba209a45a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220912.31
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31
2022-09-13 00:20:00 +00:00
DotNet-Bot
7a7236272e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220908.13
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22458.13
2022-09-08 22:07:13 +00:00
DotNet-Bot
d10c9b7871
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220907.5
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22457.5
2022-09-07 08:49:12 +00:00
dotnet-bot
3866bd13ee
Merge in 'release/6.0.4xx' changes
2022-09-07 07:48:09 +00:00
v-wuzhai
87b6130a29
Merge pull request #14455 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-09-07 00:37:49 -07:00
Jason Zhai
8e5444f2c8
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2022-09-06 23:26:24 -07:00
DotNet-Bot
24a4bb58f0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220906.40
...
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22456.40
2022-09-06 21:34:39 +00:00
dotnet-bot
10f48276b0
Merge in 'release/6.0.1xx' changes
2022-09-06 20:27:47 +00:00
dotnet-bot
1a05eb9e93
Merge in 'release/6.0.3xx' changes
2022-09-06 20:27:19 +00:00
dotnet-bot
e2d551c38e
Merge in 'release/6.0.4xx' changes
2022-09-06 20:27:19 +00:00
Marc Paine
207228c695
Merge pull request #14450 from vseanreesermsft/branding-6.0.110-2022-09-06-1031
...
Update branding to 6.0.110
2022-09-06 13:16:07 -07:00
Marc Paine
d9b20a5108
Merge pull request #14451 from vseanreesermsft/branding-6.0.305-2022-09-06-1031
...
Update branding to 6.0.305
2022-09-06 13:15:56 -07:00
Marc Paine
f81ede1f6a
Merge pull request #14452 from vseanreesermsft/branding-6.0.402-2022-09-06-1031
...
Update branding to 6.0.402
2022-09-06 13:15:44 -07:00