Commit graph

35932 commits

Author SHA1 Message Date
Jason Zhai
1cd900e438 Revert the ‘version. props’ file 2024-07-03 23:10:06 -07:00
Jason Zhai
c67d448f30 Merge branch 'release/8.0.4xx' of https://github.com/dotnet/installer into merge/release/8.0.3xx-to-release/8.0.4xx 2024-07-03 23:07:01 -07:00
Mirroring
0c3021017d Merge commit '9deecc2f900b78d92652b31729370a794a5d3aec' 2024-07-04 06:05:48 +00:00
v-wuzhai
9deecc2f90
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#19963) 2024-07-04 14:04:05 +08:00
Jason Zhai
89aca7c07e Undo excess changes 2024-07-03 20:08:39 -07:00
Jason Zhai
6816e41b74 Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer into merge/release/8.0.1xx-to-release/8.0.3xx 2024-07-03 20:03:03 -07:00
Mirroring
561a8ddadc Merge commit '282c55045f1a9dcd93b2b5b248855f1fcfec7aa4' 2024-07-04 03:00:34 +00:00
v-wuzhai
282c55045f
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#19960) 2024-07-04 10:59:10 +08:00
Mirroring
0b65c0a766 Merge commit '96970e9adedda0c14f40281527ff430363a31d34' 2024-07-03 23:26:05 +00:00
Marc Paine
96970e9ade
Update the fluent assertions version to improve test failure output. (#17982) 2024-07-03 16:21:04 -07:00
Marc Paine
cd06700138
Merge branch 'release/8.0.1xx' into merge/release/6.0.4xx-to-release/8.0.1xx 2024-07-03 15:33:40 -07:00
Marc Paine
cc62208676 Respond to PR feedback in moving the UseVSTestRunner into the test DBPs file and removing the unnecessary $ in the command result assertion file 2024-07-03 15:22:39 -07:00
Mirroring
e8e919b27c Merge commit 'ca10847c37a7c0804346f49ca4b945c0b80698cc' 2024-07-03 22:20:15 +00:00
Marc Paine
ca10847c37
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19958) 2024-07-03 15:17:19 -07:00
dotnet-maestro[bot]
bb1c5c1822
[release/8.0.4xx] Update dependencies from dotnet/sdk (#19959)
[release/8.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24270.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.5-servicing.24217.5 to 8.0.6-servicing.24270.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.5-servicing.24216.15 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.5-servicing.24224.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.5-servicing.24217.4 to 8.0.6-servicing.24269.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.5-servicing.24217.2 to 8.0.6-servicing.24269.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.400-beta.24321.3 to 12.8.400-beta.24351.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24321.3 to 8.0.400-beta.24351.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.11.0-preview-24320-06 to 17.11.0-release-24352-05 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.11.0-3.24324.9 to 4.11.0-3.24329.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.11.0 to 17.11.3 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.11.0-rc.110 to 6.11.0-rc.122 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.5 to 8.0.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.5 to 8.0.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.emsdk: from 8.0.5-servicing.24211.3 to 8.0.6-servicing.24266.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
2024-07-03 22:04:49 +00:00
Mirroring
41f180e747 Merge commit 'dd77a728c535fea9cb509610d470615935596593' 2024-07-03 20:35:39 +00:00
Marc Paine
dd77a728c5
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#19919) 2024-07-03 13:32:28 -07:00
Marc Paine
49acd51c4d
Merge branch 'release/6.0.4xx' into merge/release/6.0.1xx-to-release/6.0.4xx 2024-07-03 13:31:46 -07:00
Marc Paine
6166a8cd61
Onboard new inter-branch merge flow [Workflow] (#19922) 2024-07-03 12:42:33 -07:00
Marc Paine
5f9a19db33
Onboard new inter-branch merge flow [Configuration] (#19936) 2024-07-03 12:42:07 -07:00
Marc Paine
039e7bd9c7
[release/6.0.1xx] Switch to dSAS for internal runtimes (#19938) 2024-07-03 09:35:43 -07:00
Mirroring
dd35886f5c Merge commit 'e8dfa6bc58d15ba7ea9b8bd271396d132658a3db' 2024-07-03 15:50:54 +00:00
Mirroring
0f38b244c5 Merge commit '34a414a79dbed589edd7e524dfb906ac85115dc2' 2024-07-03 15:50:50 +00:00
Matt Mitchell
34a414a79d
[release/8.0.1xx] Switch to dSAS for internal runtimes (#19945) 2024-07-03 08:48:50 -07:00
Matt Mitchell
502a6d149a
[release/8.0.1xx] Do not run TestSdkRpm target (#19950) 2024-07-03 08:48:22 -07:00
Matt Mitchell
48c5ce7866
[release/8.0.4xx] Do not run TestSdkRpm target (#19952) 2024-07-03 08:48:12 -07:00
Matt Mitchell
e8dfa6bc58
[release/8.0.3xx] Do not run TestSdkRpm target (#19951) 2024-07-03 08:48:09 -07:00
Mirroring
0c58557720 Merge commit '37e3da1524d81095daa9a99907f09459518eaf3a' 2024-07-03 15:21:59 +00:00
Matt Mitchell
37e3da1524
[release/6.0.4xx] Switch to dSAS for internal runtimes (#19939) 2024-07-03 08:13:23 -07:00
Farhad Alizada
4b96a39553 Target the configuration file branch to release/8.0.4xx 2024-07-03 09:18:43 +02:00
Jason Zhai
d02360abc3 Merge branch 'release/8.0.1xx' into release/8.0.3xx 2024-07-02 22:49:09 -07:00
Matt Mitchell
12d6c8e5f7
[release/6.0.1xx] Remove EOL centos 7 from PRs (#19948) 2024-07-02 16:11:06 -07:00
Mirroring
acbbae997e Merge commit 'a201031f68e094b1f796f0b690a4816bfafb3e30' 2024-07-02 22:29:59 +00:00
Matt Mitchell
a201031f68
[release/8.0.3xx] Switch to dSAS for internal runtimes (#19946) 2024-07-02 15:25:29 -07:00
Matt Mitchell
c932cda6a3
[release/8.0.4xx] Switch to dSAS for internal runtimes (#19947) 2024-07-02 15:25:21 -07:00
Mirroring
1099e8d094 Merge commit 'c6c1747abb0538456e691831430d2cca397d79a4' 2024-07-02 22:16:01 +00:00
Matt Mitchell
426ed40d42
Merge branch 'release/6.0.1xx' into enable-internal-runtimes-601xx 2024-07-02 15:14:09 -07:00
Matt Mitchell
c6c1747abb
[release/6.0.4xx] Remove EOL centos 7 from PRs/CI (#19949) 2024-07-02 22:13:30 +00:00
Marc Paine
77a8ca0aef
Update branding to 6.0.425 (#19941) 2024-07-02 15:12:48 -07:00
Marc Paine
b1f0750396
Update branding to 6.0.133 (#19940) 2024-07-02 15:12:44 -07:00
Mirroring
acf567ae2d Merge commit 'f383c69a76e86c85ffc3a2304bb103a6eee38741' 2024-07-02 20:01:08 +00:00
Mirroring
888c8301a1 Merge commit 'bbcef27b5f06c8045ed8eb7b4351936980d7e31f' 2024-07-02 20:01:03 +00:00
vseanreesermsft
f383c69a76
Update branding to 8.0.304 (#19943) 2024-07-02 12:53:07 -07:00
vseanreesermsft
bbcef27b5f
Update branding to 8.0.108 (#19942) 2024-07-02 12:53:04 -07:00
Sean Reeser
5777cef586 Update branding to 6.0.425 2024-07-02 10:48:32 -07:00
Sean Reeser
bbd77dd234 Update branding to 6.0.133 2024-07-02 10:48:25 -07:00
Matt Mitchell (.NET)
9ee18250ae Enable internal sources for source build 2024-07-02 09:53:08 -07:00
Matt Mitchell (.NET)
8eb3ff9b97 Use delegation SAS for internal builds 2024-07-02 09:41:57 -07:00
Matt Mitchell (.NET)
5d670e214d Update arcade 2024-07-02 09:38:35 -07:00
Farhad Alizada
f3d395f09d Onboard new inter-branch merge flow [Configuration] 2024-07-01 16:23:34 -07:00