Commit graph

22200 commits

Author SHA1 Message Date
Michael Simons
377904ab62
Merge pull request #12501 from crummel/nugetFullfx
Add patch to build net472 in NuGet to support Omnisharp.
2021-10-25 13:18:22 -05:00
Michael Simons
9cf82e2c70
Merge pull request #12500 from dseefeld/bootstrapRoslyn
Fix roslyn to build with boostrapped build
2021-10-25 13:08:14 -05:00
Chris Rummel
278e5b5027
Remove workaround now that NuGet builds fullfx. 2021-10-25 10:11:06 -05:00
Omair Majid
6de9c8d897 [ArPow] Delete optional files under non-open source licenses
These files are not required as part of source-build, and are under
non-free licenses. Delete them when building the source-build tarball.

Fixes: https://github.com/dotnet/source-build/issues/2359
2021-10-25 10:23:45 -04:00
Chris Rummel
77928ad73e
Add patch to build net472 in NuGet to support Omnisharp. 2021-10-24 17:13:40 -05:00
Matt Mitchell
626c3886e7
[release/6.0.1xx] Remove/Replace NuGet.Client source build patches (#12504)
* Remove NuGet.Client source build patches
After the latest flow from nuget, I am fairly sure after examining and attempting to apply these patches that they all are no longer necessary. There are some slight diffs (they don't all apply as no-ops), but the code in question appears to be okay on inspection.

* Port missing parts of the patch.

* Don't remove necessary files in Roslyn patch.

Co-authored-by: Chris Rummel <crummel@microsoft.com>
2021-10-24 09:08:52 -07:00
dotnet-maestro[bot]
172b5673bf
Update dependencies from https://github.com/dotnet/sdk build 20211023.6 (#12505)
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21523.5 -> To Version 6.0.100-rtm.21523.6

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.0.0-6.21519.19 -> To Version 4.0.0-6.21521.3 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2021-10-24 09:08:34 -07:00
dotnet-maestro[bot]
6200cdc765
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12503)
* Update dependencies from https://github.com/dotnet/sdk build 20211023.4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21523.3 -> To Version 6.0.100-rtm.21523.4

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211023.5

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21523.3 -> To Version 6.0.100-rtm.21523.5

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2021-10-23 15:19:00 -07:00
dotnet-maestro[bot]
a17784c3ac
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12499)
* Update dependencies from https://github.com/dotnet/sdk build 20211022.11

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21522.10 -> To Version 6.0.100-rtm.21522.11

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211023.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21522.10 -> To Version 6.0.100-rtm.21523.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2021-10-23 14:11:31 -07:00
dseefeld
bfb2a9e0df Fix roslyn to build with boostrapped build 2021-10-23 01:37:21 +00:00
Michael Simons
1c89df4dfb
Merge pull request #12497 from eerhardt/BuildSdkForNetFx
Build Microsoft.NET.Build.Tasks for netfx
2021-10-22 19:01:46 -05:00
Michael Simons
8a0b44e72f
Merge pull request #12493 from dagood/fix-format-ref-usage
[ArPow] dotnet/format: Fix ref-only extensions package usage at runtime
2021-10-22 18:52:31 -05:00
dotnet-maestro[bot]
1639aa0eb9
Update dependencies from https://github.com/dotnet/sdk build 20211022.10 (#12498)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21522.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21522.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21521.6 to 6.0.0-rtm.21522.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21521.7 to 6.0.0-rtm.21522.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-10-22 22:47:44 +00:00
Eric Erhardt
2f9ea75be5 Build Microsoft.NET.Build.Tasks for netfx 2021-10-22 16:07:54 -05:00
dotnet-maestro[bot]
321cc8b49a
Update dependencies from https://github.com/dotnet/sdk build 20211022.8 (#12496)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.0.0-release-20210923-02 to 17.0.0 (parent: Microsoft.NET.Sdk)
2021-10-22 21:05:39 +00:00
Michael Simons
25e4eedb17
Merge pull request #12483 from dagood/prebuiltless-ready
Prepare source-build for prebuiltless build
2021-10-22 15:28:34 -05:00
Davis Goodin
ff55f86ed6 Fix nullability source compatibility after upgrade 2021-10-22 15:03:38 -05:00
Matt Mitchell
8ebb6a415b
Revert "Temporarily revert implicit versions to produce new stage0 (#12492)" (#12495)
This reverts commit 7828a7f0f0.
2021-10-22 12:33:41 -07:00
Davis Goodin
563bb4b721 Skip building prebuilt tarball if directory exists but is empty 2021-10-22 14:20:59 -05:00
Davis Goodin
17feead1af Remove PrivateSourceBuiltPrebuiltsPackageVersion: no prebuilts used 2021-10-22 14:20:58 -05:00
Davis Goodin
c46dcb7fca Fix empty SourceBuiltPrebuiltsTarballFile batch behavior 2021-10-22 14:20:32 -05:00
Davis Goodin
24f68585c3 Prepare source-build for prebuiltless build 2021-10-22 14:20:30 -05:00
Michael Simons
0d4e77331c
Merge pull request #12467 from crummel/restoreNuGetTfms
Enable missing TFMs for NuGet and MSBuild to remove templating prebuilts
2021-10-22 13:48:01 -05:00
Davis Goodin
1dca86a648 Use a patch to fix up the dependency property 2021-10-22 13:27:36 -05:00
Davis Goodin
e71e33d9cd Add reference to dotnet/format issue 2021-10-22 13:16:07 -05:00
Davis Goodin
3e0a3b5b49 dotnet/format: Fix ref-only extensions package usage at runtime 2021-10-22 13:08:47 -05:00
Matt Mitchell
7828a7f0f0
Temporarily revert implicit versions to produce new stage0 (#12492) 2021-10-22 09:57:48 -07:00
Chris Rummel
7f468fe5e6
Add patch issues to the patches. 2021-10-22 10:21:51 -05:00
Chris Rummel
ed6eb2db8e
Fix patch conflict. 2021-10-22 10:19:59 -05:00
Chris Rummel
f951587509
This really does rely on NuGet. 2021-10-22 09:58:54 -05:00
Chris Rummel
4fcb26a608
Fix sloppy patching. 2021-10-22 09:58:19 -05:00
Chris Rummel
298effbfcc
Workaround for F# smoke-tests. 2021-10-22 09:54:00 -05:00
Michael Simons
cfd811bf41
Merge pull request #12487 from lbussell/resolve-roslyn-prebuilts
[ArPow] Resolve Roslyn System.* source build prebuilts
2021-10-22 09:01:05 -05:00
Michael Simons
8cd48143b2
Merge pull request #12488 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-build
2021-10-22 08:23:59 -05:00
dotnet-maestro[bot]
2b005f3491
Update dependencies from https://github.com/dotnet/sdk build 20211021.16 (#12490)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
2021-10-22 08:05:35 +00:00
Chris Rummel
c29087f7a2
These also apply for net6.0. 2021-10-22 02:11:37 -05:00
dotnet-maestro[bot]
1e7dbb727a
Update dependencies from https://github.com/dotnet/sdk build 20211021.15 (#12489)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21520.13 to 6.0.0-rtm.21521.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21520.13 to 6.0.0-rtm.21521.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-10-22 06:10:31 +00:00
dotnet-maestro[bot]
7ae99ce59f
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12482)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21519.2 to 12.0.0-beta.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21519.2 to 6.0.1-beta.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21515-03 to 17.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.0 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - edit sourcebuild metadata for stable versioning

 - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-90ae2a78-bcca-4d8e-aedf-7eaa99dfc9bf
2021-10-22 05:34:48 +00:00
Chris Rummel
77b70c9c64
Actually only do this for netstandard. 2021-10-21 21:59:17 -05:00
Chris Rummel
de12f87965
Patch resolution 2021-10-21 21:59:17 -05:00
Chris Rummel
dde04b27b1
Have to fix some conditionals for multiple netstandards. 2021-10-21 21:59:17 -05:00
Chris Rummel
cb5ef3f9e2
NuGet also depends on XDT - add netstandard2.0 there. 2021-10-21 21:59:17 -05:00
Chris Rummel
2823ea21fb
Introduce temporary dependency from templating on NuGet to ensure it picks up the new fixed packages. 2021-10-21 21:59:17 -05:00
Chris Rummel
aab9a8b3a6
A few projects didn't use the project-wide variables for determining TFMs. 2021-10-21 21:59:17 -05:00
Chris Rummel
34ee4c4fff
Delete templating patch and just use netstandard2.0 in NuGet. 2021-10-21 21:59:17 -05:00
Chris Rummel
cfa552637d
wip: just enable themissing NuGet and MSBuild TFMs 2021-10-21 21:59:17 -05:00
Michael Simons
ffcb72fbdc Update source-build prebuilts and previous source-build 2021-10-22 02:56:26 +00:00
dotnet-maestro[bot]
a2c7b5b277
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211021.1 (#12484)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-21 23:47:27 +00:00
Logan Bussell
2903842db2
add ExtraPackageVersionPropsPackageInfo to force roslyn prebuilts to previously source built versions 2021-10-21 23:33:08 +00:00
Logan Bussell
374f8b5faa
add patch for lifting versions of roslyn prebuilts 2021-10-21 23:24:30 +00:00