Commit graph

216 commits

Author SHA1 Message Date
DotNet Bot
c296e85e33 Merged PR 19846: [internal/release/6.0.1xx] 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.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (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.21523.1 to 6.0.1-servicing.21567.5 (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.21523.1 to 6.0.1-servicing.21567.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20211115.9
- **Date Produced**: November 15, 2021 7:50:53 PM UTC
- **Commit**: 7aff324297b3853a1cb198f92ec20f6bae9e2de5
- **Branch**: r...
2021-11-18 17:54:25 +00:00
Michael Simons
5466891cbb
Update dotnet toolset used in source-build (#12701) 2021-11-17 22:12:40 -06:00
Chris Rummel
b412c61801
Re-enable F# tests that should work now. (#12686)
* Re-enable F# tests that should work now.

* Also re-enable some web tests that should work now.
2021-11-17 01:48:47 +00:00
Dan Seefeldt
7f02ccd30f
Fix previously-source-built bootstrap (#12642)
* Fix previously-source-built bootstrap

* Update based on review comments

* Update to write lines more efficiently
2021-11-15 23:44:44 +00:00
Alex Perovich
86fe76957f
Port #12374 to release/6.0.1xx (#12636)
Add downloading of runtime assets from dotnetbuilds
2021-11-15 08:37:04 -08:00
Davis Goodin
76d625236e
Allow SDK to produce reference assemblies (#12549) 2021-11-12 19:47:56 +00:00
Omair Majid
457210a04c
Also publish non-portable RID runtime symbols tarball (#12622)
This fixes a regression in .NET 6 source-build compared to the .NET
5 source-build.

source-build wants to publish runtime symbols tarball for portable (eg,
linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build.
Following .NET 5 conventions, I expected to see:

    ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz
    ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz

Unfortunately, only the portable RID (linux-x64) tarball is present
after a full source-build in .NET 6.

It turns out this is a bug in our build scripts. We try and copy
binaries - including the symbol tarballs - after building each of
runtime-portable and runtime. However, the target dependency is wrong:
after `Build`, the intermediate package doesn't exist from the
just-built repo.

What ends up happening is that nothing is copied after building
runtime-portable. However, after building runtime, the runtime-portable
intermediate artifacts are found and copied over. So the end
build has portable RID symbos, but not the non-portable ones.

Fix that by changing the dependency of this target so it runs after
intermediate packages are available.
2021-11-12 19:35:39 +00:00
Davis Goodin
772d572a31
dotnet/runtime: Disable package validation in source-build for reliability (#12526) 2021-11-12 09:36:27 -06:00
Davis Goodin
0527f05018
dotnet/runtime: Enable source-link in source-build for '.version' file (#12527) 2021-11-11 13:16:59 -06:00
Omair Majid
c603008d19
[release/6.0.1xx] [ArPow] Add smoke test for OmniSharp (#12251)
* [ArPow] Add smoke test for OmniSharp

* Try setting PATH for tests

Hopefully, this helps omnisharp find the SDK.

* edits necessary for 6.0 GA status

Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-11-02 09:00:09 -05:00
Michael Simons
9e8b04bbff
Resolve source-build dotnet-format patch conflict (#12545) 2021-10-27 12:20:05 -07:00
Matt Mitchell
fd022a39be
Remove uneeded roslyn patch (#12531) 2021-10-26 17:21:57 -07:00
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
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
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
Eric Erhardt
2f9ea75be5 Build Microsoft.NET.Build.Tasks for netfx 2021-10-22 16:07:54 -05:00
Davis Goodin
ff55f86ed6 Fix nullability source compatibility after upgrade 2021-10-22 15:03:38 -05:00
Davis Goodin
563bb4b721 Skip building prebuilt tarball if directory exists but is empty 2021-10-22 14:20:59 -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
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
Chris Rummel
c29087f7a2
These also apply for net6.0. 2021-10-22 02:11:37 -05: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
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
Michael Simons
ef208026a2
Merge pull request #12481 from MichaelSimons/smoke-test-fixes
Workaround missing smoke-test prereqs
2021-10-21 17:24:56 -05:00
Michael Simons
c6594de659
Merge pull request #12465 from lbussell/build-roslyn-ca-features
[ArPow] Re-enable building Microsoft.CodeAnalysis.Features* in roslyn source-build
2021-10-21 15:41:26 -05:00
Michael Simons
dd90b93727
Merge pull request #12456 from dagood/rm-compilers-apphost-prebuilt
[release/6.0.1xx] Remove compiler project apphosts in source-build to remove apphost pack prebuilt
2021-10-21 15:39:27 -05:00