Commit graph

4690 commits

Author SHA1 Message Date
Jason Zhai
d93d599bfc Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-11-16 19:01:03 -08:00
Jason Zhai
720f135ead Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-11-15 22:11:01 -08:00
NET Source-Build Bot
ee809e5f00
.NET Source-Build 6.0.125 November 2023 Updates (#17781) 2023-11-15 08:02:47 -06:00
Jason Zhai
6728e48183 Merge branch 'release/7.0.4xx' into release/8.0.1xx 2023-11-09 18:41:32 -08:00
Jason Zhai
17d134f533 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-11-08 23:34:23 -08:00
Michael Simons
084c161943
Remove redundant xml doc test (#17734) 2023-11-08 17:34:45 -06:00
Matt Thalman
a7d4f9cef5
[source build] Use floating tags for container image names (#17696) 2023-11-07 15:27:14 +00:00
Omair Majid
7905f1bbc8
[release/6.0] Add alpine to CI for source-build (#13074) 2023-11-07 07:53:17 -06:00
Nikola Milosavljevic
1b5e0e2049
.NET Source-Build 6.0.124 October 2023 Updates (#17618) 2023-10-24 21:02:51 +00:00
Jason Zhai
36c64d4ab7 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-10-19 23:04:18 -07:00
Michael Yanni
28c024ef44
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17583) 2023-10-19 14:15:28 -07:00
Matt Thalman
ce6e592f2d
Disable source build xml doc test (#17579) 2023-10-19 17:37:19 +00:00
Forgind
601374e078
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-10-12 15:30:38 -07:00
Jason Zhai
793a94f646 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-10-10 23:20:07 -07:00
Nikola Milosavljevic
0099fd0189
.NET Source-Build 6.0.123 October 2023 Updates (#17494) 2023-10-11 01:51:41 +00:00
Sean Reeser
b1a36abe2c Merge commit 'a33389fcc17c512c4ce21b1cf88863aa55e7307a' into internal-merge-6.0.1xx-2023-10-10-1024 2023-10-10 10:25:00 -07:00
Forgind
d6b7bfaf31
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-10-04 12:05:21 -07:00
Matt Thalman
fdd48b7620 Merged PR 34026: Update SB SDK and XML diff baselines 2023-09-28 23:44:07 +00:00
Jason Zhai
ac1b51e885 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-09-17 20:08:05 -07:00
NET Source-Build Bot
04d2e433c9
.NET Source-Build 6.0.122 September 2023 Updates (#17340) 2023-09-15 08:52:47 -05:00
Jason Zhai
40215eb0b8 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-09-13 19:13:49 -07:00
b5fbd1b9bf
[release/6.0.1xx] Fix aspnetcore build on musl-libc platforms (#17324) 2023-09-13 10:57:52 -05:00
Jason Zhai
0a49407f60 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-09-12 23:51:43 -07:00
Matt Thalman
0e0a2063a0 Merged PR 33234: Update 6.0 source-build SDK diff baseline 2023-08-17 18:59:45 +00:00
Jason Zhai
f3abd918cb Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-10 19:46:36 -07:00
Matt Thalman
e64c1a447c Merged PR 33069: Update 6.0 SDK diff
Update MSFT to SB SDK diff baseline
2023-08-10 15:12:34 +00:00
Jason Zhai
c3098a65da Merge branch 'release/7.0.4xx' 2023-08-09 22:50:56 -07:00
dotnet-bot
829ffca204 Merge in 'release/6.0.1xx' changes 2023-08-09 16:26:36 +00:00
NET Source-Build Bot
f2a927934b
.NET Source-Build 6.0.121 August 2023 Updates (#17149) 2023-08-09 16:18:30 +00:00
Marc Paine
bf10800c27
Merging internal commits for release/6.0.1xx (#17134) 2023-08-08 15:08:38 -07:00
Matt Thalman
4ace1423c3 Remove extra XML doc entry 2023-08-08 15:32:35 -05:00
dotnet-bot
a0ee1198f2 Merge in 'release/6.0.1xx' changes 2023-08-08 19:04:38 +00:00
Omair Majid
2a433a301f
[release/6.01xx] Update source-build CI to Fedora 38 (#16649) 2023-08-08 13:56:41 -05:00
Marc Paine
91e4326f3d
Merging internal commits for release/6.0.4xx (#17136) 2023-08-08 10:51:41 -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
Jason Zhai
5d764e6709 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-07 23:10:07 -07:00
Jason Zhai
ace7ff936f Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-08-02 00:23:52 -07: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
Matt Thalman
b0dda375d1 Merged PR 32726: Update SB test baselines
This reverts the changes that were made in https://github.com/dotnet/installer/pull/16959 and https://github.com/dotnet/installer/pull/16972. These changes only apply to the internal repo.
2023-07-18 20:37:24 +00:00
dotnet-bot
5b0d71301f Merge in 'release/6.0.1xx' changes 2023-07-18 15:44:04 +00:00
Matt Thalman
63943c0014
Update SB SDK diff baseline (#16972) 2023-07-18 08:35:41 -07:00
Matt Mitchell
00e4340849 Merged PR 32708: Remove applied source build patch
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
2023-07-17 22:00:26 +00:00
DotNet Bot
10710f7d8e Merged PR 32707: [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.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicing.23363.11 to 6.0.21-servicing.23364.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.21-servicing.23363.8 to 6.0.21-servicing.23364.5 (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/_gi...
2023-07-17 21:13:18 +00:00
Matt Mitchell
5d26c38ee9 Merged PR 32709: Remove applied source build patch
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
2023-07-17 21:09:22 +00:00
Jason Zhai
0cc3091826 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-12 20:05:55 -07:00
Jason Zhai
5c7af0f162 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-12 20:01:36 -07:00
Matt Thalman
f326414f09
Update MissingXmlDoc baseline (#16959) 2023-07-12 16:50:32 +00:00
Jason Zhai
eb232fd2eb Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-11 23:03:16 -07:00