Commit graph

11483 commits

Author SHA1 Message Date
dotnet-maestro[bot]
a47236db64 Update dependencies from https://github.com/dotnet/test-templates build 20230817.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.23415.2 -> To Version 1.1.0-rc.23417.1
2023-08-17 16:32:40 +00:00
dotnet-maestro[bot]
8bcdc0361b
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17192)
[release/7.0.4xx] Update dependencies from dotnet/test-templates
2023-08-15 16:30:03 +00:00
v-wuzhai
64882681b2
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#17172) 2023-08-14 18:52:40 -07:00
dotnet-maestro[bot]
f42900e18f Update dependencies from https://github.com/dotnet/test-templates build 20230810.2
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.1.0-rc.23409.2 -> To Version 1.1.0-rc.23410.2
2023-08-14 08:07:10 +00:00
Jason Zhai
2698dc3e0a Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-08-10 19:43:13 -07:00
dotnet-maestro[bot]
1349348f8d Update dependencies from https://github.com/dotnet/test-templates build 20230809.2
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.1.0-rc.23409.1 -> To Version 1.1.0-rc.23409.2
2023-08-09 21:39:28 +00:00
dotnet-maestro[bot]
683e2d9b57
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17154)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 08:44:20 -07:00
Jason Zhai
f1de5c6ece Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-08-09 00:02:33 -07:00
dotnet-maestro[bot]
1a3b7c0d49 Update dependencies from https://github.com/dotnet/arcade build 20230808.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3
2023-08-08 23:59:03 +00:00
dotnet-maestro[bot]
13a9c86583 Update dependencies from https://github.com/dotnet/arcade build 20230808.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3
2023-08-08 23:59:03 +00:00
NET Source-Build Bot
51976bbb72
.NET Source-Build 7.0.110 August 2023 Updates (#17150) 2023-08-08 23:03:28 +00:00
vseanreesermsft
27ecd661b8
Merging internal commits for release/7.0.1xx (#17140)
Co-authored-by: Matt Thalman <Matt.Thalman@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2023-08-08 12:55:41 -07:00
Marc Paine
2d726ca05f
Merging internal commits for release/7.0.4xx (#17138) 2023-08-08 11:31:24 -07:00
dotnet-maestro[bot]
e9940734b9
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17133)
[release/7.0.4xx] Update dependencies from dotnet/test-templates
2023-08-08 17:50:43 +00:00
Marc Paine
de957516ed
Revert template version subtraction 2023-08-08 10:50:33 -07:00
Sean Reeser
ac2cf5e978 Merge commit '7b77e35a2bc056a01180bfdec51ad27a11b1d412' into internal-merge-7.0.3xx-2023-08-08-1042 2023-08-08 10:42:16 -07:00
Sean Reeser
b959c9ba8a Merge commit '73bf45718d009e374d473477e61814bbaba494f9' into internal-merge-7.0.4xx-2023-08-08-1042 2023-08-08 10:42:08 -07:00
v-wuzhai
704bf2f631
Update branding to 7.0.401 (#17109) 2023-08-02 00:14:43 -07:00
Marc Paine
cc23f14dad
Temporarily subtract two from the web templates 2023-08-01 15:50:24 -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
67833da159
Switch to servicing branding 2023-08-01 14:41:26 -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
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
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
ad6ee0fd85
Update implicit version for August release 2023-07-19 09:56:46 -07:00
DotNet-Bot
79bfb91009 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.20
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.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.10 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk
2023-07-17 21:11:18 +00:00
DotNet-Bot
2fd6547cc1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.21
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.306 -> To Version 7.0.307

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk
2023-07-17 21:10:50 +00:00
DotNet-Bot
ece5b130b1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.12
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.306 -> To Version 7.0.307

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk
2023-07-17 21:00:03 +00:00
DotNet Bot
ae53b8aa72 Merged PR 32699: [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.WindowsDesktop.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23364.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23364.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.9-servicing.23320.18 to 7.0.10-servicing.23363.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.9-servicing.23321.6 to 7.0.10-servicing.23363.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.9-servicing.23321.9 to 7.0.10-servicing.23364.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.9-servicing.23320.18 to 7.0.10-servicing.23363.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.9 to 7.0.10...
2023-07-17 20:31:04 +00:00
DotNet-Bot
823a87ea90 Update dependencies from https://github.com/dotnet/sdk build 20230713.6
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.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
 From Version 17.7.0-preview-23317-01 -> To Version 17.7.0-preview-23362-01 (parent: Microsoft.NET.Sdk
2023-07-13 20:08:54 +00:00
dotnet-maestro[bot]
c940151653
[release/7.0.3xx] Update dependencies from dotnet/arcade (#16962)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:51:28 -07:00
dotnet-maestro[bot]
9460454a1d
[release/7.0.4xx] Update dependencies from dotnet/arcade (#16963)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:51:19 -07:00
dotnet-maestro[bot]
ae5b538ae4
[release/7.0.1xx] Update dependencies from dotnet/arcade (#16964)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:50:38 -07:00
Marc Paine
cd4ab70550
Stabilize branding (#16916) 2023-07-12 09:28:40 -07:00
dotnet-maestro[bot]
67d2bafabf Update dependencies from https://github.com/dotnet/sdk build 20230711.22
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23361.13 -> To Version 7.0.400
2023-07-12 00:03:10 +00:00
dotnet-maestro[bot]
24d2abce13 Update dependencies from https://github.com/dotnet/sdk build 20230711.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23360.14 -> To Version 7.0.400-preview.23361.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.8 -> To Version 7.0.9 (parent: Microsoft.NET.Sdk
2023-07-11 23:02:44 +00:00
NET Source-Build Bot
2c2d698597
.NET Source-Build 7.0.109 July 2023 Updates (#16943) 2023-07-11 14:34:43 -05:00
Sean Reeser
0743ee8b28 Merge commit '3e9283a8e906761fcf9973c0007a75c0eb20baea' into internal-merge-7.0.1xx-2023-07-11-1023 2023-07-11 10:23:49 -07:00
Sean Reeser
39702acb5c Merge commit 'f500069cb7cdd01b435961287361b9ad21203c67' into internal-merge-7.0.3xx-2023-07-11-1023 2023-07-11 10:23:40 -07:00
dotnet-maestro[bot]
c3be712947 Update dependencies from https://github.com/dotnet/sdk build 20230710.14
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23360.2 -> To Version 7.0.400-preview.23360.14

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.7.0-3.23329.1 -> To Version 4.7.0-3.23360.7 (parent: Microsoft.NET.Sdk
2023-07-11 03:09:29 +00:00
dotnet-maestro[bot]
8632e8af4d Update dependencies from https://github.com/dotnet/sdk build 20230710.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23355.11 -> To Version 7.0.400-preview.23360.2
2023-07-10 11:59:01 +00:00
Marc Paine
e37a974497
Stabil
7.0.4xx will be shipping its final preview next week and so putting out the PR to stabilize branding in preparation for GA release. Update the implicit version to be automatic. This PR should wait till the runtime in SDK has been updated to 7.0.9 on Tuesday I think. 

I believe some tests will need to be disabled with the implicit version update.
2023-07-07 15:14:02 -07:00
dotnet-maestro-bot
263fb022a9
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16892)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-07-06 10:10:24 -07:00
v-wuzhai
cb7bc36c25
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16776) 2023-07-05 19:12:54 -07:00