Commit graph

28668 commits

Author SHA1 Message Date
Forgind
2acabacb0f
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16944) 2023-07-12 11:21:26 -07:00
Marc Paine
cd4ab70550
Stabilize branding (#16916) 2023-07-12 09:28:40 -07:00
Jason Zhai
7381bec755 Try to resolve source-build patch conflicts 2023-07-12 01:42:25 -07:00
Jason Zhai
ba7651ffbc Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-07-11 23:20:56 -07:00
Jason Zhai
eb232fd2eb Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-11 23:03:16 -07:00
v-wuzhai
4968400e17
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16954) 2023-07-11 22:37:12 -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
Marc Paine
eff002e760
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16952) 2023-07-11 16:56:26 -07: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
Marc Paine
d1746a1c30
Merging internal commits for release/7.0.1xx (#16941) 2023-07-11 12:14:03 -07:00
NET Source-Build Bot
03de5438b7
.NET Source-Build 6.0.120 July 2023 Updates (#16942) 2023-07-11 14:01:05 -05:00
Marc Paine
810f8e82ba
Merging internal commits for release/6.0.1xx (#16937) 2023-07-11 11:47:50 -07:00
Marc Paine
6e5de6525b
Merging internal commits for release/7.0.3xx (#16940) 2023-07-11 11:35:58 -07:00
Marc Paine
2bc80e92a1
Merging internal commits for release/6.0.4xx (#16939) 2023-07-11 11:35:46 -07:00
Marc Paine
eb4b20c720
Merging internal commits for release/6.0.3xx (#16938) 2023-07-11 11:35:33 -07:00
Forgind
96ddfa6596
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#16926) 2023-07-11 10:36:52 -07: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
Sean Reeser
272b39f66e Merge commit 'ee124f7fe1946ba82febd79ef25c3040de461d3a' into internal-merge-6.0.4xx-2023-07-11-1017 2023-07-11 10:17:06 -07:00
Sean Reeser
8ad8121e95 Merge commit '2282fe998c54635c744653971f1903f98a33d49b' into internal-merge-6.0.3xx-2023-07-11-1016 2023-07-11 10:16:57 -07:00
Sean Reeser
3ee1863ab0 Merge commit 'd63b17be66f766a5381950bce677884e4e3bb5b6' into internal-merge-6.0.1xx-2023-07-11-1016 2023-07-11 10:16:47 -07:00
Michael Simons
786df50860 Resolve source-build patch conflicts 2023-07-11 14:31:03 +00:00
Jason Zhai
62cc192c57 Add feed to find package with version 6.0.20 2023-07-11 03:25:34 -07:00
Jason Zhai
1ee0b6e012 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-11 00:45:34 -07:00
v-wuzhai
d1edc37741
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16930) 2023-07-10 22:56:03 -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
v-wuzhai
08339ea47e
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16921) 2023-07-10 19:01:31 -07:00
Forgind
de86f1f4cd
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16914) 2023-07-10 10:27:21 -07:00
Matt Thalman
c5f29a611d Update format patch 2023-07-10 09:31:51 -05:00
Matt Thalman
65db63eb44 Update format patch 2023-07-10 08:06:04 -05: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
Jason Zhai
bf62ec46b4 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-09 22:51:32 -07: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
fd5696554a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898)
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-07 13:07:58 -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
dotnet-maestro-bot
7a0352f5fb
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16891)
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: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-06 10:09:19 -07:00
Matt Thalman
bd99c96e72
Include RID in SB artifact file names (#16855) 2023-07-06 08:40:35 -05:00
Matt Thalman
03d62bc222
Update SB SDK diff baseline for 6.0 (#16822) 2023-07-06 08:39:16 -05:00
v-wuzhai
cb7bc36c25
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16776) 2023-07-05 19:12:54 -07:00
v-wuzhai
a2e9ed9df1
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16797) 2023-07-05 19:12:24 -07:00
v-wuzhai
c10a26659a
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16894) 2023-07-05 19:11:01 -07:00
dotnet-maestro[bot]
7e4cf7c70e Update dependencies from https://github.com/dotnet/sdk build 20230705.11
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23355.3 -> To Version 7.0.400-preview.23355.11
2023-07-05 23:51:41 +00:00
Marc Paine
38091caf0e
Update branding to 6.0.121 (#16885) 2023-07-05 16:13:32 -07:00
Marc Paine
dae68bd9f7
Update branding to 7.0.110 (#16888) 2023-07-05 15:45:16 -07:00
Marc Paine
f3d7896093
Update branding to 6.0.413 (#16887) 2023-07-05 15:38:55 -07:00
Marc Paine
5b1ea46020
Update branding to 7.0.307 (#16889) 2023-07-05 15:19:18 -07:00
Marc Paine
59ad809023
Update branding to 6.0.316 (#16886) 2023-07-05 15:11:44 -07:00
dotnet-maestro[bot]
045f0dd6c3
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16883)
[release/7.0.4xx] Update dependencies from dotnet/sdk
2023-07-05 22:11:21 +00:00
Sean Reeser
fc5f6f47aa Update branding to 7.0.307 2023-07-05 14:39:01 -07:00