Commit graph

32049 commits

Author SHA1 Message Date
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
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
Ella Hathaway
dbd2384d43 Simplify GetFileContentsAsync by using lamda 2023-08-08 16:45:27 +00:00
Ella Hathaway
ebf1776397 Add newline to end of file 2023-08-08 16:38:48 +00:00
Ella Hathaway
3c0ca3d82d Remove type from RHS of declaration
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-08-08 16:34:07 +00:00
Michael Simons
a884cf6e8c
Update patches directory documentation to reference patch guidelines (#17127) 2023-08-08 10:35:27 -05:00
dotnet-maestro[bot]
a25d2291b5
[main] Update dependencies from dotnet/source-build-externals (#17130)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-08 08:28:12 -07:00
Michael Simons
43a5c7a7e0
Add CentOSStream8_Offline_PreviousSourceBuiltSdk CI leg (#17131) 2023-08-08 15:21:49 +00:00
Jason Zhai
5d764e6709 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-07 23:10:07 -07:00
v-wuzhai
8dd5e6171b
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17006) 2023-08-07 22:59:48 -07:00
Ella Hathaway
c5094a20a7 Make use of async/await for getting file contents 2023-08-07 21:29:38 +00:00
Ella Hathaway
ab660eaf09 Instantiate HttpClient once 2023-08-07 21:26:29 +00:00
dotnet-maestro[bot]
c7045b1a4a
[main] Update dependencies from dotnet/source-build-reference-packages (#17096)
[main] Update dependencies from dotnet/source-build-reference-packages
2023-08-07 21:08:19 +00:00
Matt Thalman
e12f683e7c
Revert "aspnetcore patch to exclude WasmLinkerTest project from build" (#17122) 2023-08-07 07:15:26 -05:00
Marc Paine
1289a84a55
Let's try to calculate the prerelease label automatically in the future (#17123) 2023-08-04 09:56:31 -07:00
Ella Hathaway
383cb48f5a Replace WebClient with HttpClient to fix WebClient obsolete warning 2023-08-04 16:38:53 +00:00
v-wuzhai
042639edf1
[main] Update dependencies from dotnet/source-build-externals (#17102) 2023-08-04 01:21:51 -07:00
v-wuzhai
f091d826c3
[main] Update dependencies from dotnet/arcade (#17120) 2023-08-03 20:15:02 -07:00
Marc Paine
af10ccbdae
include version in other locales, too (#17124) 2023-08-03 13:17:32 -07:00
Forgind
fdcbfa815a Add BundledManifests. 2023-08-03 11:57:50 -07:00
Forgind
cc759ddedf include version in other locales, too 2023-08-03 11:38:35 -07:00
dotnet-maestro[bot]
4c8139b851 Update dependencies from https://github.com/dotnet/arcade build 20230802.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23381.1 -> To Version 8.0.0-beta.23402.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23374.1 -> To Version 1.0.0-beta.23381.1 (parent: Microsoft.DotNet.Arcade.Sdk
2023-08-03 12:13:28 +00:00
Jason Zhai
c8f9fd43da Merge branch 'main' of https://github.com/dotnet/installer into darc-main-6d9440d2-48da-44b3-8557-3a25f9d983a2 2023-08-02 19:35:20 -07:00
Marc Paine
48d2b5b724 Let's try to calculate the prerelease label automatically in the future 2023-08-02 15:46:48 -07:00
Jacques Eloff
26626f3db3
Suppress downgrade failures (#17117) 2023-08-02 14:54:48 -07:00
Matt Thalman
34b13c9a1e
aspnetcore patch to exclude WasmLinkerTest project from build (#17121) 2023-08-02 12:57:45 -05:00
Nikola Milosavljevic
19d47d44ee
Remove unnecessary sourcelink dependency (#17099) 2023-08-02 10:36:48 -07:00
Oleksandr Didyk
dcf485b822
allow empty intermediate for NuGet (#17100) 2023-08-02 10:09:27 -05:00
Matt Thalman
96ebbaf0fa Use a different nuget path for smoke tests
This is needed to avoid the smoke tests project from using reference
assemblies that were restored in the product build phase. Those all get
placed in the prereqs/packages/restored path. So this change sets the
smoke tests to use an isolated location at
prereqs/packages/restored/smoke-tests
2023-08-02 09:21:32 -05:00
dotnet-maestro[bot]
a1671e1b82 Update dependencies from https://github.com/dotnet/source-build-externals build 20230801.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23374.2 -> To Version 8.0.0-alpha.1.23401.1
2023-08-02 12:27:14 +00:00
dotnet-maestro[bot]
3abb504b0c Update dependencies from https://github.com/dotnet/arcade build 20230801.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.23381.1 -> To Version 8.0.0-beta.23401.3

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23374.1 -> To Version 1.0.0-beta.23381.1 (parent: Microsoft.DotNet.Arcade.Sdk
2023-08-02 12:13:56 +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
Sébastien Ros
97d4db029c
[main] Update dependencies from dotnet/sdk (#17095) 2023-08-01 18:38:43 -07:00
dotnet-maestro[bot]
11353da34a Update dependencies from https://github.com/dotnet/sdk build 20230801.23
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-rc.1.23381.2 -> To Version 8.0.100-rc.1.23401.23

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-rc.1.23380.1 -> To Version 8.0.0-rc.1.23381.1 (parent: Microsoft.NET.Sdk
2023-08-01 23:37:15 +00:00
Marc Paine
cc23f14dad
Temporarily subtract two from the web templates 2023-08-01 15:50:24 -07:00
dotnet-maestro[bot]
1e9d07b219 Update dependencies from https://github.com/dotnet/sdk build 20230801.17
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-rc.1.23381.2 -> To Version 8.0.100-rc.1.23401.17

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-rc.1.23380.1 -> To Version 8.0.0-rc.1.23381.1 (parent: Microsoft.NET.Sdk
2023-08-01 22:49:16 +00: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
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-maestro[bot]
f1aa7dec5e Update dependencies from https://github.com/dotnet/sdk build 20230801.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-rc.1.23381.2 -> To Version 8.0.100-rc.1.23401.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.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.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-rc.1.23380.1 -> To Version 8.0.0-rc.1.23381.1 (parent: Microsoft.NET.Sdk
2023-08-01 20:25:34 +00:00