Commit graph

1216 commits

Author SHA1 Message Date
Oleksandr Didyk
a7815af504
add sb test for runtime packs in self-contained publish (#16783) 2023-07-18 12:30:23 -05:00
Michael Yanni
724642682f Merge branch 'main' into merge/release/7.0.4xx-to-main
# Conflicts:
#	src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
#	src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
2023-07-17 16:36:58 -07:00
Nikola Milosavljevic
df4ea7dff9
New command-line APIs in sourcelink (#17002) 2023-07-17 12:47:42 -07:00
Jason Zhai
b85ce887ab Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-16 22:56:32 -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
7195529e0b Merge branch 'release/7.0.4xx' 2023-07-14 01:25:02 -07:00
Jason Zhai
c4596ee6aa Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-13 19:41:41 -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
63048382f3 Update format patch 2023-07-13 00:12:24 -07:00
Jason Zhai
4c531d279a Try to resolve source-build patch conflicts 2023-07-12 23:40:52 -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
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
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
f75b46682c
.NET Source-Build 8.0.100-preview.6.23330.14 July 2023 Updates (#16945) 2023-07-11 19:45:21 +00: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
Nikola Milosavljevic
8062db472d
Build sourcelink after command-line-api (#16924) 2023-07-10 13:13:36 -07:00
Matt Thalman
9c792aa68d
Disable R2R publish test for Mono (#16900) 2023-07-10 15:08:15 +00: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
dotnet-maestro[bot]
5e4a6560aa
[main] Update dependencies from dotnet/sdk (#16864)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-preview.7.23329.9 to 8.0.0-preview.7.23355.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.7.23328.3 to 8.0.0-preview.7.23354.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.7.23329.3 to 8.0.0-preview.7.23355.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.7.23329.1 to 8.0.0-preview.7.23354.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.8.0-beta.23327.15 to 12.8.0-beta.23354.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.100-beta.23327.15 to 8.0.100-beta.23354.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.7.0-3.23329.1 to 4.8.0-1.23355.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.8.0-preview-23328-02 to 17.8.0-preview-23353-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23355.7 (parent: Microsoft.NET.Sdk)
  - System.CommandLine: from 2.0.0-beta4.22564.1 to 2.0.0-beta4.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.command-line-api: from 0.1.356401 to 0.1.430701 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-c9de4a14-3172-41f6-9336-1865d7edc45d

 - Remove backported msbuild source-build patch

 - Remove backported command-line-api source-build patches

 - Merge branch 'main' into darc-main-c9de4a14-3172-41f6-9336-1865d7edc45d
2023-07-06 09:53:22 +00:00
Matt Thalman
ed5150ffa1
SB smoke tests: test the published output (#16858) 2023-06-30 13:55:24 -05:00
Matt Thalman
49b8561691
Update SDK diff baselines due to containers change (#16870) 2023-06-30 13:52:46 -05:00
Nikola Milosavljevic
76128a42f4
Update SDK-diff baseline - removal of runtime Intellisense entries (#16849) 2023-06-29 07:04:57 -07:00
Nikola Milosavljevic
5bf1bb2bab
Fix System.Text.Json poison instances (#16826) 2023-06-28 10:29:15 -07:00
Nikola Milosavljevic
a1f68be8a8
SDK diff - exclude runtime components in roslyn layout (#16820) 2023-06-26 11:07:46 -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
29bfd81725
Disable warnings for aspnetcore, cleanup NoWarns (#16792) 2023-06-23 01:08:59 +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
Michael Simons
2a43d7040d
Remove SuppressTfmSupportBuildWarnings usage (#16790) 2023-06-22 22:15:04 +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
Marc Paine
913c487f76
[main] Update dependencies from dotnet/sdk (#16779) 2023-06-22 12:24:54 -07:00
Marc Paine
6eaaf3e962 Remove blazor server from the installer tests as it was removed from the templates in https://github.com/dotnet/aspnetcore/pull/48615 2023-06-22 11:22:41 -07:00