Commit graph

5235 commits

Author SHA1 Message Date
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
Sean Reeser
6c0c0d063d Remove applied source build patch 2023-07-17 14:03:39 -07:00
Forgind
9d01f1819a
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16994) 2023-07-14 16:17:57 -07:00
Jason Zhai
78cdd6d8ba Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-13 19:37:41 -07: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
Jason Zhai
3a98864d75 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-07-12 19:51:26 -07:00
Matt Thalman
4bf374a7b1
Update SB SDK diff baseline (#16973) 2023-07-12 16:57:31 -07:00
Matt Thalman
f326414f09
Update MissingXmlDoc baseline (#16959) 2023-07-12 16:50:32 +00: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
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
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
1ee0b6e012 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-11 00:45:34 -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
Jason Zhai
bf62ec46b4 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-09 22:51:32 -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
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
Nikola Milosavljevic
5bf1bb2bab
Fix System.Text.Json poison instances (#16826) 2023-06-28 10:29:15 -07:00
Jason Zhai
26604a6bcf Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-06-24 22:36:14 -07:00
dotnet-bot
d63b17be66 Merge in 'release/6.0.1xx' changes 2023-06-23 18:40:24 +00:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json (#16798) 2023-06-23 18:31:22 +00:00
dotnet-bot
3e9283a8e9 Merge in 'release/7.0.1xx' changes 2023-06-23 17:36:23 +00:00
Matt Thalman
c255b45852
.NET Source-Build 7.0.108 June 2023 OOB Updates (#16795) 2023-06-23 17:27:37 +00:00
dotnet-bot
723d5b09c3 Merge in 'release/6.0.1xx' changes 2023-06-23 14:36:28 +00:00
NET Source-Build Bot
8f7ebafe7b
.NET Source-Build 6.0.118 June 2023 Updates (#16670) 2023-06-23 14:27:22 +00:00
Matt Thalman
47aeefdcc0 Merged PR 32193: Set OmniSharp run script to be executable
Backport of https://github.com/dotnet/installer/pull/16772 but had to be modified due to lack of API support in 6.0.
2023-06-22 22:18:15 +00:00
Matt Thalman
1dbbc52520 Merged PR 32192: Set OmniSharp run script to be executable
Backport of https://github.com/dotnet/installer/pull/16772
2023-06-22 22:11:11 +00:00
Nikola Milosavljevic
83d8c761bd
Update poison-usage baseline (#16775) 2023-06-21 21:20:41 +00:00
Jason Zhai
bb531ffeab Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-06-15 22:27:02 -07:00
Marc Paine
a5708e110a
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2023-06-14 12:57:55 -07:00
Marc Paine
fae9cf2b3c
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-06-14 12:51:33 -07:00
Marc Paine
4f086a7b87
Merging internal commits for release/7.0.1xx (#16654) 2023-06-14 12:09:54 -07:00
NET Source-Build Bot
306c38cab9
.NET Source-Build 7.0.107 June 2023 Updates (#16669) 2023-06-13 22:34:15 +00:00
Sean Reeser
d4b3907756 Merge commit 'bf72c06963e2bb23c1abfd97a9ed50e47e155027' into internal-merge-7.0.1xx-2023-06-13-1017 2023-06-13 10:17:25 -07:00
Marc Paine
27c33cba6d
Backport version property changes (#16468) 2023-06-07 11:44:48 -07:00
Jason Zhai
b6eeb22197 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-06-07 01:36:11 -07:00
Tom Deseyn
896efd974c 7.0.1xx: ignore WarnOrErrorOnTargetArchitectureMismatch. 2023-05-25 13:42:55 +02:00
Forgind
1eb909edbc Change property name (#16341)
Co-authored-by: Forgind <Forgind@users.noreply.github.com>
2023-05-22 13:04:42 -07:00
Forgind
baad58f5b4 Change property name (#15907)
This means the package version property won't collide with MicrosoftNetCompilersToolsetPackageVersion, which is already in use for another package, albeit the core version of the same package.
2023-05-22 13:04:26 -07:00
Forgind
783478bbb0 Generate version for Roslyn packages (#15216)
Co-authored-by: Forgind <Forgind@users.noreply.github.com>
2023-05-22 13:03:48 -07:00
Matt Thalman
1633fdb585 Merged PR 31462: Add System.Reflection.Metadata to poison baseline
This adds back System.Reflection.Metadata.dll to the poison baseline. It was originally removed in https://github.com/dotnet/installer/pull/16078 but now has showed up again.
2023-05-22 19:38:58 +00:00