Commit graph

6018 commits

Author SHA1 Message Date
Eric Erhardt
3f837b6913
Delete vstest patch that was backported with 21bc097b12 2023-04-26 11:45:57 -05:00
Eric Erhardt
64c3c1471e
Remove runtime patch that was backported with 2802c972f7 2023-04-26 11:10:36 -05:00
Eric Erhardt
57e217062e
Merge branch 'main' into darc-main-2b67c806-3e93-4a35-83ca-82672f3b3edf 2023-04-26 08:13:25 -05:00
Eric Erhardt
e214378193
Remove backported asp.net patch 2023-04-26 08:10:48 -05:00
Přemek Vysoký
4918bfbd81
Do not require Source Link info for VMR smoke tests (#16241) 2023-04-26 09:10:53 +00:00
dotnet-maestro[bot]
0007377e1e
[main] Update dependencies from dotnet/sdk (#16227)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
2023-04-25 17:31:49 -05:00
Michael Simons
15b1d4a1b1
Add runtime source-build patch to fix stage2 build (#16233) 2023-04-25 20:55:28 +00:00
Michael Simons
41eeeb362c
Update source-build prebuilts (#16231) 2023-04-25 11:07:25 -05:00
Marc Paine
5645dfe608
Merge branch 'main' into merge/release/7.0.4xx-to-main 2023-04-24 17:06:04 -07:00
Nikola Milosavljevic
59fe5f82b6
TFM trimming - emsdk - Move NoTargetFrameworkFiltering property to Directory.Build.props (#16214) 2023-04-24 12:34:52 -07:00
Michael Simons
294b49956e
Add vstest patch to address System.Private.Uri prebuilts (#16215) 2023-04-24 15:45:22 +00:00
Přemek Vysoký
f308bf657f
Move Source Link args to build.sh, support release manifest (#16184)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-04-24 07:23:43 -07:00
Nikola Milosavljevic
1586596860 Add backport comment 2023-04-24 14:13:38 +00:00
Nikola Milosavljevic
2a80505525 Move NoTargetFrameworkFiltering property to Directory.Build.props 2023-04-24 14:04:10 +00:00
Přemek Vysoký
18d53e5710
Exclude SignTool test binaries from the VMR (#16210) 2023-04-24 11:45:01 +00:00
Přemek Vysoký
61ee278aad
Add emsdk localization files to allowed VMR binaries (#16211) 2023-04-24 10:49:59 +00:00
dotnet-maestro[bot]
892410186f
[main] Update dependencies from dotnet/sdk (#16198)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.4.23221.2 to 8.0.0-preview.4.23222.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.4.23221.2 to 8.0.0-preview.4.23222.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.4.23221.2 to 8.0.0-preview.4.23222.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-preview.4.23221.3 to 8.0.0-preview.4.23221.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.4.23221.2 to 8.0.0-preview.4.23222.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.4.23220.4 to 8.0.0-preview.4.23221.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.4.23221.2 to 8.0.0-preview.4.23222.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.5.23220.2 to 8.0.0-preview.5.23221.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.7.0-1.23220.5 to 4.7.0-1.23222.1 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.7.0-preview.1.17 to 6.7.0-preview.1.18 (parent: Microsoft.NET.Sdk)

 - Remove uneeded sdk patch

 - Merge branch 'main' into darc-main-fdcf4eae-57ea-4557-a61e-e2920ae4149f
2023-04-23 20:12:25 +00:00
dotnet-maestro[bot]
30b74a7bde
[main] Update dependencies from dotnet/sdk (#16197)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
2023-04-21 17:59:10 -07:00
Michael Simons
4fb7b6eb32 Resolve format patch conflict 2023-04-21 20:24:54 +00:00
Michael Simons
ac0ccb6148 Revert "remove format patch"
This reverts commit 9fdf58a4e6.
2023-04-21 20:24:07 +00:00
Larry Ewing
9fdf58a4e6
remove format patch 2023-04-21 15:17:45 -05:00
Marc Paine
c67f9466a5 Change the name of the file and add tizen. This will have to wait till the SDK PR is in most likely. 2023-04-21 13:07:15 -07:00
Matt Thalman
6a2a8c2798
Add sourcelink patch to workaround MSBuild cache issue (#16187) 2023-04-21 13:07:00 -05:00
Nikola Milosavljevic
98313ce301
Fix TFM path for Test CLI package (#16186) 2023-04-21 17:35:43 +00:00
Marc Paine
a4ec49fae3
Fix the swr file logic
It was supposed to be && and not || to avoid copying those files
2023-04-21 10:14:05 -07:00
Michael Simons
d1ee91a0ed Re-enable dotnet/format in source-build 2023-04-21 03:09:55 +00:00
Michael Simons
a8cc6793c6
Merge branch 'main' into darc-main-8a154d6d-22ea-4cb2-bfb6-b99b78fe6656 2023-04-20 21:19:33 -05:00
Michael Simons
5580e32db0
Update source-build prebuilts (#16176) 2023-04-21 01:56:10 +00:00
Michael Simons
1fa93166f7 Resolve roslyn-analyzers patch conflict 2023-04-21 00:35:15 +00:00
dotnet-maestro[bot]
b9688fbc32
[main] Update dependencies from dotnet/sdk (#16173)
[main] Update dependencies from dotnet/sdk


 - Remove backported roslyn-analyzers source-build patch
2023-04-20 23:11:41 +00:00
Nikola Milosavljevic
cc52435c9b
Use correct ref-pack versions (#16172) 2023-04-20 15:50:08 -05:00
Michael Simons
d202ee051f
Update source-build dotnet project to reflect real build order (#16168) 2023-04-20 12:29:43 -05:00
Larry Ewing
a07e5c65b4
Add KnownWebAssemblySdkPack to GenerateBundledVersions for .NET 6 and 7 (#16159) 2023-04-20 12:23:35 -05:00
dotnet-maestro[bot]
c7bb987f70
[main] Update dependencies from dotnet/source-build-reference-packages (#16169)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-04-20 12:16:27 -05:00
dotnet-maestro[bot]
28b0d23f12
[main] Update dependencies from dotnet/sdk (#16033)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marek Safar <marek.safar@gmail.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Dan Moseley <danmose@microsoft.com>
2023-04-20 08:49:04 -05:00
Nikola Milosavljevic
3565cc8dd0 Removing unnecessary comment 2023-04-20 13:22:36 +00:00
Nikola Milosavljevic
4dd124d119 Use full version for source-build artifacts 2023-04-19 21:57:11 +00:00
Marek Fišera
00fdf2ee6d Fix tfm for net 6 2023-04-19 17:40:17 +02:00
Marek Fišera
bac666b858 Add KnownWebAssemblySdkPack to GenerateBundledVersions pointing to a package Microsoft.NET.Sdk.WebAssembly.Pack for .NET 6 and 7. 2023-04-19 17:35:44 +02:00
Matt Thalman
108bf13291
Update version of SB prebuilts tarball (#16155) 2023-04-19 14:03:51 +00:00
Matt Thalman
75acb045a8
Enable PVP flow for templating repo (#16149) 2023-04-19 08:44:00 -05:00
Michael Simons
628b538232 Merge branch 'main' of https://github.com/dotnet/installer into sdk-installer 2023-04-18 17:23:09 +00:00
Michael Simons
a557015ebe Disable source-build integration tests that need additional investigation 2023-04-18 17:18:20 +00:00
dotnet-maestro-bot
16c10f8115
[automated] Merge branch 'release/7.0.4xx' => 'main' (#16134)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: Matt Mitchell (.NET) <mmitche@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-04-18 14:32:12 +02:00
v-wuzhai
ea888ffd79
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16126) 2023-04-17 19:42:15 -07:00
Larry Ewing
e40dead297
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d 2023-04-17 17:11:58 -05:00
Nikola Milosavljevic
bccbd91991
Merge branch 'main' into roslyn.property 2023-04-17 14:11:38 -07:00
Nikola Milosavljevic
299c7b1952 Source-build cannot override MicrosoftNetCompilersToolsetPackageVersion property 2023-04-17 21:09:48 +00:00
Nikola Milosavljevic
3f0a24b8d7 Source-build cannot override MicrosoftNetCompilersToolsetPackageVersion property 2023-04-17 20:50:09 +00:00
Matt Thalman
9404ce488a
Update SB prebuilts tarball (#16137) 2023-04-17 20:49:55 +00:00