Commit graph

29007 commits

Author SHA1 Message Date
Sean Reeser
4f13b144fe Merge commit '10710f7d8e8fa29aea83b7ba59c0e169a7afc008' into internal-merge-6.0.4xx-2023-08-08-1012 2023-08-08 10:12:47 -07:00
Sean Reeser
ea9b0feb0e Merge commit '5d26c38ee96606c1e474039d445c27cba6d2b229' into internal-merge-6.0.3xx-2023-08-08-1012 2023-08-08 10:12:38 -07:00
Sean Reeser
f8278428f7 Merge commit '00e4340849d26c84e65f750acb91355d4c40f9ae' into internal-merge-6.0.1xx-2023-08-08-1012 2023-08-08 10:12:29 -07:00
Jason Zhai
5d764e6709 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-07 23:10:07 -07:00
dotnet-bot
7611b7220e Merge in 'release/6.0.3xx' changes 2023-08-08 06:07:58 +00:00
v-wuzhai
8dd5e6171b
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17006) 2023-08-07 22:59:48 -07:00
dotnet-bot
d96a4769eb Merge in 'release/6.0.4xx' changes 2023-08-02 07:29:31 +00:00
Jason Zhai
ace7ff936f Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-08-02 00:23:52 -07:00
v-wuzhai
f06047209a
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17111) 2023-08-02 00:21:25 -07:00
v-wuzhai
704bf2f631
Update branding to 7.0.401 (#17109) 2023-08-02 00:14:43 -07:00
DotNet-Bot
fe9469ff1c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.20
2023-08-01 23:37:34 +00:00
Marc Paine
cc23f14dad
Temporarily subtract two from the web templates 2023-08-01 15:50:24 -07:00
Marc Paine
0682e45ad0
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-08-01 14:45:25 -07:00
Marc Paine
8ef01a5b7f
[release/7.0.4xx] Update dependencies from dotnet/arcade (#17079) 2023-08-01 14:44:45 -07:00
Marc Paine
05a4749353
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17078) 2023-08-01 14:44:37 -07:00
Marc Paine
ccd607f5aa
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17092) 2023-08-01 14:44:31 -07:00
Marc Paine
67833da159
Switch to servicing branding 2023-08-01 14:41:26 -07:00
dotnet-bot
0297a50b2c Merge in 'release/6.0.4xx' changes 2023-08-01 21:38:48 +00:00
dotnet-bot
f021bcb990 Merge in 'release/7.0.1xx' changes 2023-08-01 21:38:34 +00:00
dotnet-bot
53aa93f036 Merge in 'release/6.0.1xx' changes 2023-08-01 21:38:18 +00:00
Marc Paine
30ae40bc19
Update branding to 7.0.111 (#17107) 2023-08-01 14:30:39 -07:00
Marc Paine
0928e1c83d
Update branding to 6.0.414 (#17106) 2023-08-01 14:30:27 -07:00
Marc Paine
41fa0fb5c5
Update branding to 6.0.122 (#17104) 2023-08-01 14:30:19 -07:00
DotNet-Bot
4e40396054 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.7
2023-08-01 21:01:13 +00:00
DotNet-Bot
fd19247682 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23401.9
2023-08-01 21:00:12 +00:00
dotnet-bot
64239f9d9d Merge in 'release/7.0.3xx' changes 2023-08-01 19:12:31 +00:00
dotnet-bot
c99e58a539 Merge in 'release/6.0.3xx' changes 2023-08-01 19:12:05 +00:00
Marc Paine
a2cd644e69
Update branding to 7.0.308 (#17108) 2023-08-01 12:04:02 -07:00
Marc Paine
d867a33063
Update branding to 6.0.317 (#17105) 2023-08-01 12:04:00 -07:00
Sean Reeser
cc7a0a9c17 Update branding to 7.0.401 2023-08-01 11:01:19 -07:00
Sean Reeser
1cc16c4f4d Update branding to 7.0.308 2023-08-01 11:01:14 -07:00
Sean Reeser
607aa73912 Update branding to 7.0.111 2023-08-01 11:01:10 -07:00
Sean Reeser
eccb361192 Update branding to 6.0.414 2023-08-01 11:01:05 -07:00
Sean Reeser
9beeb9ef34 Update branding to 6.0.317 2023-08-01 11:01:00 -07:00
Sean Reeser
4ccaa3edee Update branding to 6.0.122 2023-08-01 11:00:55 -07:00
dotnet-maestro[bot]
20d8a77dc1 Update dependencies from https://github.com/dotnet/test-templates build 20230731.1
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.1.0-rc.23330.2 -> To Version 1.1.0-rc.23381.1
2023-07-31 10:21:12 +00:00
dotnet-maestro[bot]
0e25cdd13e Update dependencies from https://github.com/dotnet/arcade build 20230720.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3
2023-07-27 18:02:22 +00:00
dotnet-maestro[bot]
536ba6ad99 Update dependencies from https://github.com/dotnet/arcade build 20230720.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3
2023-07-27 18:02:21 +00:00
Sean Reeser
73bf45718d Merged PR 32760: remove patch
remove patch
2023-07-20 05:33:49 +00:00
Sean Reeser
f28324a7b5 remove patch 2023-07-19 19:28:24 -07:00
DotNet Bot
92db475f1d Merged PR 32757: [internal/release/7.0.4xx] 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.FSharp.Compiler**: from 12.7.0-beta.23328.4 to 12.7.0-beta.23364.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.400-beta.23328.4 to 7.0.400-beta.23364.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Test.Sdk**: from 17.7.0-preview-23362-01 to 17.7.0-preview-23364-03 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.7.0-3.23361.9 to 4.7.0-3.23366.1 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20230719.15
- **Date Produced**: July 19, 2023 10:35:05 PM UTC
- **Commit**: 8e1f76c1f41ecd37935288c617c53342533db704
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.400 to 7.0.400][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.400-rtm.23367.20 to 7.0.400-rtm.23369.15][1]
  - **Microsoft.NET.Sdk**: [from 7.0.400-rtm.23367.20 to 7.0.400-rtm.23369.15][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.400-rtm.23367.20 to 7.0.400-rtm.23369.15][1]
  - **Microsoft.FSharp.Compiler**: [from 12.7.0-beta.23328.4 to 12.7.0-beta.23364.5][2]
  - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.400-beta.23328.4 to 7.0.400-beta.23364.5][2]
  - **Microsoft.NET.Test.Sdk**: [from 17.7.0-preview-23362-01 to 17.7.0-preview-23364-03][3]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.7.0-3.23361.9 to 4.7.0-3.23366.1][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9f9d6fed9c&targetVersion=GC8e1f76c1f4&_a=files
[2]: 521a4efba7...159a701477
[3]: d7f4faa42b...bc17bb9693
[4]: 91c9c05370...dad7898acd

[DependencyUpdate]: <> (End)

[marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b)
2023-07-19 23:06:08 +00:00
DotNet-Bot
c45da053b3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230719.15
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400 -> To Version 7.0.400

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.7.0-beta.23328.4 -> To Version 12.7.0-beta.23364.5 (parent: Microsoft.NET.Sdk
2023-07-19 22:56:15 +00:00
dotnet-bot
bedcfd3281 Merge in 'release/7.0.4xx' changes 2023-07-19 19:37:14 +00:00
Marc Paine
b07e54c89f
Update implicit version for August release (#17016) 2023-07-19 12:27:17 -07:00
Marc Paine
ad6ee0fd85
Update implicit version for August release 2023-07-19 09:56:46 -07:00
Matt Thalman
b0dda375d1 Merged PR 32726: Update SB test baselines
This reverts the changes that were made in https://github.com/dotnet/installer/pull/16959 and https://github.com/dotnet/installer/pull/16972. These changes only apply to the internal repo.
2023-07-18 20:37:24 +00:00
Matt Thalman
ba920f88ac Merged PR 32725: Revert "Update SB SDK diff baseline (#16973)"
Reverts the changes that were made in https://github.com/dotnet/installer/pull/16973. This change is only relevant in the internal repo.
2023-07-18 19:05:47 +00:00
dotnet-bot
5b0d71301f Merge in 'release/6.0.1xx' changes 2023-07-18 15:44:04 +00:00
Matt Thalman
63943c0014
Update SB SDK diff baseline (#16972) 2023-07-18 08:35:41 -07:00
Matt Mitchell
00e4340849 Merged PR 32708: Remove applied source build patch
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
2023-07-17 22:00:26 +00:00