Commit graph

34495 commits

Author SHA1 Message Date
github-actions[bot]
2148be2073
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19982) 2024-07-11 08:25:20 -05:00
Ella Hathaway
c42f8e4308
Update MsftToSbSdk.diff (#19983) 2024-07-11 07:48:50 -05:00
NET Source-Build Bot
17e71494b2
.NET Source-Build 6.0.132 July 2024 Updates (#19974) 2024-07-10 15:11:34 +00:00
v-wuzhai
ebfe1e90dc
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19972) 2024-07-10 17:40:51 +08:00
Jason Zhai
a432216985 Merge branch 'release/6.0.4xx' of https://github.com/dotnet/installer into merge/release/6.0.1xx-to-release/6.0.4xx 2024-07-09 22:44:07 -07:00
Marc Paine
c7f172f15f
Merging internal commits for release/6.0.4xx (#19969) 2024-07-09 13:16:42 -07:00
Marc Paine
99b5b939c0
Merging internal commits for release/6.0.1xx (#19968) 2024-07-09 13:16:21 -07:00
Sean Reeser
09e5f26a35 Merge commit '0f8efdc0a7d0c18416d00ce1a4b0f0ca3c7bb38c' into internal-merge-6.0.4xx-2024-07-09-1042-b339f86f-2ad3-4094-9c9b-4895410b23a5 2024-07-09 10:42:06 -07:00
Sean Reeser
e6a27465f7 Merge commit 'b1806f3a38b61b34fb53e175efce615f223718e9' into internal-merge-6.0.1xx-2024-07-09-1041-c79b233c-8538-4d68-96e3-b5a1f6a0713c 2024-07-09 10:41:57 -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
Marc Paine
ca10847c37
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19958) 2024-07-03 15:17:19 -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
039e7bd9c7
[release/6.0.1xx] Switch to dSAS for internal runtimes (#19938) 2024-07-03 09:35:43 -07: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
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
Matt Mitchell
12d6c8e5f7
[release/6.0.1xx] Remove EOL centos 7 from PRs (#19948) 2024-07-02 16:11:06 -07: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
888c8301a1 Merge commit 'bbcef27b5f06c8045ed8eb7b4351936980d7e31f' 2024-07-02 20:01:03 +00: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
Mirroring
56937fe8d6 Merge commit '03065cafae0f89b376fa983773e909e341db96c0' 2024-06-24 21:05:34 +00:00
Ella Hathaway
03065cafae
Remove dash from sdk diff build tag (#19928) 2024-06-24 20:57:07 +00:00
Farhad Alizada
dcebdfb923 Onboard new inter-branch merge flow [Workflow] 2024-06-21 11:43:19 +02:00
Alexander Köplinger
68acf81475
Remove intentional error 2024-06-20 14:31:27 +02:00
Marc Paine
ced92df301
Merge branch 'release/8.0.1xx' into marcpopMSFT-addnewlines 2024-06-19 15:35:24 -07:00
dotnet-bot
0c536ee170 Merge in 'release/8.0.1xx' changes 2024-06-19 16:06:52 +00:00
NET Source-Build Bot
946c757c46
Update Source-Build SDK Diff Tests Baselines and Exclusions (#19913) 2024-06-19 10:58:09 -05:00
DotNet Bot
1bdaef7265 Merged PR 40527: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be
- **Build**: 20240617.5
- **Date Produced**: June 17, 2024 5:48:48 PM UTC
- **Commit**: 289435f5c45053c7599cf237fefc8391d1eb7f0b
- **Branch**: refs/heads/internal/release/8.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.107 to 8.0.107][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.107-servicing.24314.16 to 8.0.107-servicing.24317.5][1]
  - **Microsoft.NET.Sdk**: [from 8.0.107-servicing.24314.16 to 8.0.107-servicing.24317.5][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.107-servicing.24314.16 to 8.0.107-servicing.24317.5][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe482e71a594dfc60045b3b02ace7c0592753ac71&targetVersion=GC289435f5c45053c7599cf237fefc8391d1eb7f0b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
2024-06-17 18:21:53 +00:00
DotNet-Bot
6517189e61 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240617.5
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.107 -> To Version 8.0.107
2024-06-17 18:00:15 +00:00
dotnet-bot
b0a6a3b296 Merge in 'release/8.0.1xx' changes 2024-06-17 17:38:03 +00:00
Ella Hathaway
de7be3dce6
[8.0.1xx] Backport CreateBaselineUpdatePR Tool (#19910) 2024-06-17 17:28:37 +00:00
dotnet-bot
9b2ed635d6 Merge in 'release/8.0.1xx' changes 2024-06-17 16:00:47 +00:00
Ella Hathaway
a5b1fd3969
Increase timeout of license scan tests (#19909) 2024-06-17 08:52:06 -07:00
DotNet Bot
0f8efdc0a7 Merged PR 40500: [internal/release/6.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 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.32-servicing.24313.5 to 6.0.32-servicing.24314.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240615.2
- **Date Produced**: June 15, 2024 8:34:41 PM UTC
- **Commit**: d1ba1897fb2799cf7a51bab3492c933a4fdad702
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.424-servicing.24314.33 to 6.0.424-servicing.24315.2][1]
  - **Microsoft.NET.Sdk**: [from 6.0.424-servicing.24314.33 to 6.0.424-servicing.24315.2][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.32 to 6.0.32][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.6][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.6][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.32-servicing.24313.5 to 6.0.32-servicing.24314.4][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC048243a38e47e874236d495ecb1ff21b3f5aaad0&targetVersion=GCd1ba189...
2024-06-15 21:23:43 +00:00