Commit graph

4501 commits

Author SHA1 Message Date
Marc Paine
290291a0da Only do signcheck if there are files to sign check 2022-03-10 16:57:47 -08:00
Marc Paine
2c17f40ecf
Remove maui workloads from 6.0.100
The old workloads break MU so we either have to update them or remove them.
2022-03-10 14:03:12 -08:00
MichaelSimons
ca2b7c8cbe Update source-build with 6.0.103 artifacts 2022-03-10 00:19:52 +00:00
vseanreesermsft
08f3930ac3
Merging internal commits for release/6.0.1xx (#13347)
* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22115.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.2-servicing.22064.8 to 6.0.3-servicing.22115.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22053.6 to 4.0.1-1.22114.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.102 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.102-servicing.22068.7 to 6.0.103-servicing.22116.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22114.6 to 4.0.1-1.22116.5 (parent: Microsoft.NET.Sdk)

 - Remove source-build aspnetcore patch to always build targeting packs because the backported fix is flowing in

* Merged PR 21331: Add runtime patch to reference correct System.Reflection.MetadataLoadContext version

System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build.
In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking
the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion.

* Merged PR 21346: [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.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (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**: 20220221.9
- **Date Produced**: February 21, 2022 7:09:27 PM UTC
- **Commit**: 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.103 to 6.0.103][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.103 to 6.0.103][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbecb321&targetVersion=GC3d6f35b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC488cbc4&targetVersion=GC988d95c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 21441: [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.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22121.10 to 6.0.103-servicing.22123.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (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**: 20220224.11
- **Date Produced**: February 24, 2022 8:11:47 PM UTC
- **Commit**: 574686d9d185bd75770481fa76a82a0871210af4
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3]
  - **Microsoft.NETCor...

* Merged PR 21459: [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.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20220224.18
- **Date Produced**: February 24, 2022 10:36:20 PM UTC
- **Commit**: 36d5c10d65ec7577234f1b72c25e21b9512f1895
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1]
  - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.3 to 6.0.3][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC67f3050&targetVersion=GC36d5c10&_a=files
[2]: https://dev.azure.com/dnceng/intern...

* Update to temp SBRP version.

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
2022-03-09 08:34:39 -06:00
dotnet-maestro[bot]
0dc1d1a48f
[release/6.0.1xx] Update dependencies from dotnet/arcade (#13312)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-04 19:42:04 -06:00
MichaelSimons
9b9c22e77d Fix tarball CI condition 2022-03-04 14:10:42 +00:00
Marc Paine
565c3b2885
Merge pull request #13307 from dotnet/marcpopMSFT-CGFixes
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
2022-03-03 11:04:11 -08:00
Michael Simons
3dfda06124
Rewrite smoke-tests.sh in new test framework based smoke tests (#13286) 2022-03-03 08:02:48 -06:00
Djuradj Kurepa
68182c36d0 Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:27:57 -08:00
Marc Paine
b305016c87
Merge pull request #12790 from dotnet/marcpopMSFT-workloadmanifesttxt
Fix the logic that generates the fallback text file
2022-03-02 14:48:26 -08:00
Michael Simons
5e3471b471
Always run sb bootstrap CI leg (#13300) 2022-03-02 15:58:55 -06:00
Michael Simons
ccf17282ea
Update source-build's MsftToSbSdk baseline (#13296) 2022-03-01 19:17:45 -06:00
Michael Simons
e8a47cb304
Remove unused legacy template references from source-build (#13173) 2022-03-01 11:42:54 -06:00
Michael Simons
88bf53f746
Adjust handling of reference packages directory (#13238) 2022-03-01 11:39:47 -06:00
Michael Simons
083549c2e2
Add source-build nowarn for NU1603 (#13289) 2022-02-28 19:38:51 -06:00
Logan Bussell
410b4423d3
Make NuGet.config copy path in source-build CI more explicit (#13265)
* make nuget config path in source build CI more explicit

* add extra brackets to conditional in source build CI to prevent bash syntax error

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-02-25 15:57:48 -08:00
Logan Bussell
aa3dd86d7f
fix smoke-test authenticated feeds copy and smoke-test logs directory copy (#13255) 2022-02-19 01:03:25 +00:00
MichaelSimons
c099a557b9 Add source-build patch to address arcade bootstrap issue 2022-02-18 15:33:14 +00:00
Logan Bussell
215108835e
[release/6.0.1xx] Add source-build tests for dotnet format (#13207)
* add dotnet format tests

* some updates from code review

* move helper methods out of DotNetFormatTests class

* rearrange smoke test assets

* update various smoke-test paths and remove root repo check from legacy smoke test script

* fix smoke-test-prereqs tar command path

* fix naming conventions and remove extra formatting test

* more refactoring from pr comments

* refactor BaselineHelper comparison methods

* simplify comparison methods

* clarify FormatTest expected result naming

* remove unnecessary empty props and targets files
2022-02-18 08:51:43 -06:00
Chris Rummel
cab7e65d17
Remove bootstrapping for CI builds now that we use CentOS7 previously-source-built (#13232) 2022-02-17 01:05:17 +00:00
Michael Simons
f6763d6f6d
Gather additional smoke test prereqs (#13233) 2022-02-16 15:56:19 -06:00
Omair Majid
35abe3c7cf
Add CentOS Stream 9 container to CI matrix (#12955) 2022-02-15 23:35:05 +00:00
Chris Rummel
606bca49cb
Update to SDK and previously-source-built 6.0.102. (#13221) 2022-02-15 03:12:25 +00:00
Michael Simons
d69361cbcf
Add test to compare msft and sb sdk contents (#13153) 2022-02-10 15:58:01 -06:00
Sean Reeser
2186b8b250 Merge commit '02d5242ed7ca7c3747fc89196cf67aeff260c6ac' into internal-merge-6.0.1xx-2022-02-08-1019 2022-02-08 10:19:26 -08:00
Logan Bussell
7d14092c5f
Override Microsoft.Net.Sdk.WindowsDesktop references during source-build in Roslyn (#13093)
* override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn

* add new EmptySdk in the source build tarball

* remove roslyn solution filter patch
2022-02-07 09:25:08 -08:00
Michael Simons
2842b74fd3
Refactor smoke-test to capture prereqs (#13145) 2022-02-04 12:52:30 -06:00
Omair Majid
176600a235
Add arm64 packages to source-build bootstrap (#13157)
Currently, source-build is failing out-of-the-box on arm64 because ilasm
and friends are missing on arm64.

The errors look like this:

src/source-build-reference-packages.4643b750ccc93ca151eed888da70b67f0198d1fd/artifacts/source-build/self/src/src/targetPacks/ILsrc/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.csproj:
error NU1101: Unable to find package
runtime.linux-arm64.microsoft.netcore.ilasm. No packages exist with this
id in source(s): prebuilt, previously-source-built, reference-packages,
source-built
[.dotnet/sdk/6.0.101/NuGet.targets]

Fix this and related errors by ading arm64 artifacts to the bootstrap
step.

This change is sufficient to make source-build work out-of-the-box on
arm64 now using the normal steps:

    ./build.sh /p:ArcadeBuildTarball=true /p:TarballDir=/some/dir
    cd /some/dir
    ./prep.sh --bootstrap && ./build.sh
2022-02-03 08:02:14 -06:00
Chris Rummel
15e9018f2a
Updates to produce Microsoft.DotNet.Common.ProjectTemplates.2.1/6.0 in source-build (#13122)
* Updates to produce Microsoft.DotNet.Common.ProjectTemplates.2.1/6.0 in source-build

Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-01-27 15:03:37 -06:00
Michael Simons
3454f6cd99
Source-build tweaks to aid release process (#13101)
* Source-build tweaks to aid release process

* Edit per code review
2022-01-24 21:49:05 -06:00
Michael Simons
0dec528400
Implement beginnings of C# based tests (#13052)
* Implement beginnings of C# based tests

* Convert xml dox tests

* Updates per code review

* Fixup of previous commit

* Edits per code review

* Refactor testRunTitle to make distinguishable between build legs
2022-01-21 07:59:36 -06:00
Michael Simons
b9540d3005
Remove unnecessary Arcade bootstrap patch (#13092) 2022-01-20 14:28:22 -06:00
Michael Simons
4a1e7f6238
Update source-build toolset and artifacts to 6.0.1 (#12860)
* Update source-build toolset and artifacts to 6.0.1

* Update PrivateSourceBuiltArtifactsPackageVersion
2022-01-20 09:58:43 -06:00
Omair Majid
3e4f44cf23
Include musl bits in source-build bootstrap tarball (#13076) 2022-01-20 09:20:36 -06:00
DotNet Bot
02d5242ed7 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Resolve source-build patch conflicts

 - Remove source-build runtime patch that was backported

 - Merge branch 'internal/release/6.0.1xx' of https://dnceng.visualstudio.com/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679

 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9

 - Download bits from dotnetbuilds/internal

 - Merge branch 'darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679' of https://dev.azure.com/dnceng/internal/_git/dotnet-installer into darc-internal/release/6.0.1xx-a0407bef-058b-488f-9

 - Merge remote-tracking branch 'dnceng/internal/release/6.0.1xx' into darc-internal/release/6.0.1xx-a0407bef-058b-488f-956f-b7929b351679
2022-01-19 18:34:20 +00:00
Michael Simons
a22825a1ff
Add runtime and aspnetcore patches to always build libs, app.ref and targetting packs (#13009)
* Add runtime patch to build all packages during source-build

* Add aspnetcore patch to always build App.Ref and targeting packs
2022-01-19 07:47:28 -06:00
Matt Mitchell
9092e6a3c4
Merge pull request #13077 from MichaelSimons/internal-clone
Add additional clause in ConvertInternalRepos condition
2022-01-18 21:47:56 -08:00
MichaelSimons
5846bfe682 Add additional clause in ConvertInternalRepos condition 2022-01-19 00:42:46 +00:00
Marc Paine
6f0f80e3aa
Update GenerateBundledVersions.targets 2022-01-13 14:08:42 -08:00
Daniel Plaisted
0d3f10e495
Merge pull request #12987 from dsplaisted/fix-installertype-location
Fix installertype path for patches
2022-01-10 16:58:14 -08:00
Daniel Plaisted
b00ba9b79e Fix installertype path for patches 2022-01-06 17:46:04 -08:00
Michael Simons
f14e400349
Exclude omnisharp tests from CentOS 7 CI (#12858)
* Exclude omnisharp tests from CentOS 7 CI

* Update src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml

Co-authored-by: Chris Rummel <crummel@microsoft.com>

Co-authored-by: Chris Rummel <crummel@microsoft.com>
2021-12-17 14:30:05 -06:00
Michael Simons
586476f7e5
Add logic to convert internal repo uris in version.details.xml (#12852)
* Add logic to convert internal repo uris in version.details.xml

* code review updates
2021-12-16 18:45:17 -06:00
Matt Mitchell
f58d51e6ae
Merging internal commits for release/6.0.1xx (#12827)
* Support source-build tarball creation w/internal repos

* 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...

* Merged PR 19997: [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.21567.8 to 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (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**: 20211118.7
- **Date Produced**: November 18, 2021 8:11:25 PM UTC
- **Commit**: a35d9cf17ada1a09791d4f5e2b61e0a33bfb9475
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21567.27 to 6.0.101-servicing.21568.7][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.0 to 6.0.0][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.1-servicing.21568.2][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.0-rtm.21567.8 to 6.0.0-rtm.21523.1][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.0 to 6.0.1][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0de2b2e&targetVersion=GCa35d9cf&_a=files
[2]: ac655f0...59fea7d
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCac655f0&targetVersion=GCef15b55&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 20001: [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.Net.Compilers.Toolset**: from 4.0.0-6.21526.21 to 4.0.1-1.21568.1 (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**: 20211118.11
- **Date Produced**: November 18, 2021 10:53:09 PM UTC
- **Commit**: 95eaa4de1bbaafa9a1d95c913b1ef80138a9a34f
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.101-servicing.21568.7 to 6.0.101-servicing.21568.11][1]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.0.0-6.21526.21 to 4.0.1-1.21568.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa35d9cf&targetVersion=GC95eaa4d&_a=files
[2]: c7d6f9f...6ab6601

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21569.2 (parent: Microsoft.NET.Sdk)

Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
2021-12-15 16:21:31 -08:00
Michael Simons
1b7269474c
Update build logic to handle checked in project.assets.json file in NuGet repo (#12810) 2021-12-14 19:23:41 -06:00
Michael Simons
0c8aa6d7a9
Clean prebuilt baseline (#12816)
* Remove prebuilt baseline

* Make prebuilt baseline file optional
2021-12-14 19:23:15 -06:00
Omair Majid
4e9a0b6434
[release/6.0.1xx] Add some additional distros to the CI matrix (#12141) 2021-12-14 16:29:29 -06:00
Sean Reeser
2c5af44dde Merge commit 'ef49f6213a0256d5e8b10d9a573f8dd355bc8593' into internal-merge-6.0.1xx-2021-12-14-0946 2021-12-14 09:46:54 -08:00
Marc Paine
9979d00dd5 Fix the logic that generates the fallback text file 2021-12-10 10:10:05 -08:00
Dan Seefeldt
65bbb444f8
Remove un-needed version properties (#12683) 2021-12-09 13:37:17 -06:00
Michael Simons
7d5dca7f85
Update release/6.0.1xx build machines (#12748)
* Switch another leg to Ubuntu 18

* Switch to Ubuntu 18

* Also update source build queues to Ubuntu 18

Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2021-12-06 22:37:28 +00:00
dotnet-bot
d0a1ab74c9 Merge in 'release/6.0.1xx' changes 2021-11-18 19:58:46 +00:00
Dan Seefeldt
6d87160a67
Remove 2.1 templates from dynamic templates (#12511) 2021-11-18 19:57:14 +00:00
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
MichaelSimons
15e9067ed2 Support source-build tarball creation w/internal repos 2021-11-18 16:18:18 +00:00
Michael Simons
5466891cbb
Update dotnet toolset used in source-build (#12701) 2021-11-17 22:12:40 -06:00
Michael Simons
836def0423
Add bootstrap build to CI (#12651) 2021-11-17 16:07:20 -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
Daniel Plaisted
d608d977da
Merge pull request #12657 from dotnet/marcpopMSFT-WDarm64targeting50
Looks like our logic for the RID for WindowsDesktop was merged incorrectly into 6.0
2021-11-15 18:48:57 -08: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
Marc Paine
fb42fb7282
Update GenerateBundledVersions.targets 2021-11-12 13:47:22 -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
Michael Simons
9056116cb3
Increase source-build tarball build timeout (#12652) 2021-11-12 09:31:38 -06:00
Daniel Plaisted
a329cf4049
Merge pull request #12600 from dsplaisted/workload-manifest-msis
Bundle workload manifests as separate MSIs
2021-11-11 13:10:09 -08:00
Marc Paine
56b2f07db1
Merge pull request #12550 from dotnet/marcpopMSFT-6.0branding
Update to 6.0 in our wxl files as that was reverted a while back.
2021-11-11 12:50:22 -08:00
Davis Goodin
0527f05018
dotnet/runtime: Enable source-link in source-build for '.version' file (#12527) 2021-11-11 13:16:59 -06:00
Michael Simons
84217d6e27
Specify depth when updating submodules (#12588) 2021-11-11 08:22:24 -06:00
Marc Paine
86cb0ed124 Update the release notes link. 2021-11-05 11:11:00 -07:00
Daniel Plaisted
2f331cfbc4 Verify that workload manifest MSIs are signed 2021-11-03 23:14:42 -07:00
Daniel Plaisted
590cbca7ea Include workload manifests wixobj file 2021-11-03 10:35:42 -07:00
Daniel Plaisted
3217a5c4a3 Remove ALLOWMSIINSTALL property for workload manifest MSIs 2021-11-03 09:41:43 -07:00
Daniel Plaisted
69a868b025 Only download workload manifest MSIs on Windows and not ARM 2021-11-03 09:40:39 -07:00
Daniel Plaisted
61774f69e8 Stop generating manifest MSI VS Redist NuGet package
Reverts 41ef6e2cac
2021-11-03 09:08:58 -07:00
Daniel Plaisted
082265dd3a Bundle workload manifests as separate MSIs 2021-11-02 23:39:27 -07:00
Marc Paine
fbf342ea55
Update GenerateBundledVersions.targets 2021-11-02 10:31:01 -07: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
4eaf8ab130
Merge pull request #12562 from MichaelSimons/ci-improvements
Enable offline build and capture artifacts in PR validation
2021-11-02 08:52:17 -05:00
Marc Paine
168cfd8f98 Update to 6.0 in our wxl files as that was reverted a while back. 2021-10-27 16:39:26 -07: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
c020befd81
Merge pull request #12507 from omajid/arpow-tarball-remove-files-with-non-open-source-licenses
[release/6.0.1xx] [ArPow] Delete optional files under non-open source licenses
2021-10-25 13:58:22 -05: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
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
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
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
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
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
Michael Simons
4e2d434f9a Workaround missing smoke-test prereqs 2021-10-21 19:38:00 +00:00
Michael Simons
8dc521acfa
Merge pull request #12477 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-build
2021-10-21 13:53:35 -05:00
Michael Simons
9326af2814
Merge pull request #12472 from dseefeld/fixMsBuild
[ArPow] Build msbuild for net472 and remove dependency on VS component
2021-10-21 13:29:55 -05:00
Davis Goodin
4674b50a34 Polish patch files: squash and add links 2021-10-21 12:49:15 -05:00
MichaelSimons
b0217294ed aspnetcore stable version workaround 2021-10-21 17:19:38 +00:00
Matt Mitchell
00a9212068 touch sb dir 2021-10-21 08:08:10 -07:00
dotnet-maestro[bot]
f0fe351603
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12473)
* Update dependencies from https://github.com/dotnet/sdk build 20211020.26

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.26

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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.31

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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.1

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100-rtm.21521.2

* 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 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>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2021-10-21 06:22:35 -07:00
Michael Simons
08fc0161cb Update source-build prebuilts and previous source-build 2021-10-21 12:32:30 +00:00
Michael Simons
023e0d7186 Update to not include CA.Collection package in source-build 2021-10-21 12:26:21 +00:00
Michael Simons
5bf7c8e147
Merge pull request #12466 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-built
2021-10-21 04:43:30 -05:00
Michael Simons
d38d8049ef
Merge pull request #12469 from dagood/prebuilt-apphost-aspnetcore
Fix patch removing aspnetcore apphost pack prebuilt
2021-10-21 04:33:04 -05:00
Michael Simons
544f720d0c Edits per code review 2021-10-21 04:32:21 +00:00
Michael Simons
16d51bd2aa Patch edits 2021-10-21 03:14:32 +00:00
Michael Simons
57ab17c67a Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into build-roslyn-ca-features 2021-10-21 00:56:31 +00:00
Michael Simons
375383b5fa Refactor patches to build additional projects 2021-10-21 00:55:46 +00:00
Davis Goodin
388ed26a0c Fix patch removing aspnetcore apphost pack prebuilt 2021-10-20 19:53:47 -05:00
dseefeld
d2e491a787 Build msbuild for net472 and remove depdency on VS 2021-10-20 21:59:04 +00:00
Michael Simons
b14e9a8e77 Add roslyn-analyzer as format dependency 2021-10-20 21:03:14 +00:00
Logan Bussell
a429914541
build Microsoft.CodeAnalysis.Features* in roslyn 2021-10-20 19:13:20 +00:00
Michael Simons
5f76b4d101 Update source-build prebuilts and previous source-built 2021-10-20 19:00:31 +00:00
dotnet-maestro[bot]
dca28b2c52
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12451)
[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.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (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.21518.9 to 6.0.0-rtm.21519.4 (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.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk)

 - Revert removed feed

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patches

 - Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patch conflicts
2021-10-20 18:30:45 +00:00
Michael Simons
d0676ba094
Merge pull request #12462 from MichaelSimons/linker-prebuilts
[ArPow] Eliminate linker prebuilts
2021-10-20 12:10:07 -05:00
Dan Seefeldt
757ac5dd9f
Flow version of Microsoft.CodeAnalysis.Common in roslyn (#12461) 2021-10-20 17:04:25 +00:00
dotnet-maestro[bot]
83818e8038
[release/6.0.1xx] Update dependencies from dotnet/arcade (#12457)
* Update dependencies from https://github.com/dotnet/arcade build 20211019.3

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21515.3 -> To Version 6.0.0-beta.21519.3

* Resolve source-build patch conflicts

* Restore the windowsdesktop feed

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2021-10-20 09:14:05 -07:00
Michael Simons
286b597ea3
Merge pull request #12397 from lbussell/roslyn-build-more-projects
[ArPow] Add patches for building more roslyn projects
2021-10-20 11:09:17 -05:00
Michael Simons
6e31861fea Eliminate linker prebuilts 2021-10-20 15:00:05 +00:00
Michael Simons
1f41ef82c9
Merge pull request #12458 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-build
2021-10-20 07:40:11 -05:00
Michael Simons
a6871de837
Merge pull request #12455 from crummel/updateRoslynPatches
Update to Roslyn version of patch.
2021-10-19 22:14:19 -05:00
Michael Simons
27329680a2
Updates to patch comment 2021-10-19 20:08:10 -05:00
Michael Simons
d64125fa04 Update source-build prebuilts and previous source-build 2021-10-20 01:03:22 +00:00
Davis Goodin
2cf457ef38 Remove compiler project apphosts in source-build 2021-10-19 19:39:45 -05:00
Logan Bussell
fa57d106cc
don't build Microsoft.CodeAnalysis.Features* in source-build 2021-10-20 00:35:53 +00:00
Michael Simons
987ae36a54
Merge pull request #12351 from MichaelSimons/onboard-format
Add format repo to source-build tarball
2021-10-19 17:10:29 -05:00
Logan Bussell
83689bbca8
squash roslyn patches 2021-10-19 21:38:10 +00:00
Logan Bussell
15aa160465
add description to roslyn Microsoft.Build patch 2021-10-19 21:22:47 +00:00
Chris Rummel
6a1d84abb1
Update to Roslyn version of patch. 2021-10-19 14:57:10 -05:00
Logan Bussell
35104750bc
add patch for forcing roslyn Microsoft.Build to 16.5.0 2021-10-19 19:18:26 +00:00
Michael Simons
0951ed0c14
Merge pull request #12453 from eerhardt/RoslynAnalyzersPrebuilts
Eliminate pre-built assets during source-build for roslyn-analyzers
2021-10-19 14:15:18 -05:00
MichaelSimons
027603a892 Add format repo to source-build tarball 2021-10-19 19:01:55 +00:00
Dan Seefeldt
9c7822aad2
Add ArcadeSharedFrameworkSdkOverride (#12452) 2021-10-19 18:52:54 +00:00
Michael Simons
d9c398514c
Merge pull request #12449 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-built
2021-10-19 12:29:04 -05:00
Eric Erhardt
53b74e7551 Eliminate pre-built assets during source-build for roslyn-analyzers
This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP.

Contributes to https://github.com/dotnet/source-build/issues/2420
Contributes to https://github.com/dotnet/source-build/issues/2527
2021-10-19 11:51:47 -05:00
Davis Goodin
c26605442b
dotnet/aspnetcore: Fix AppHost pack prebuilt usage in source-build (#12441) 2021-10-19 10:46:38 -05:00
Michael Simons
cf368887e0 Update source-build prebuilts and previous source-built 2021-10-19 12:50:56 +00:00
Michael Simons
afc7be470f
Merge pull request #12438 from MichaelSimons/arcade-nuget
[ArPow] Resolve arcade nuget prebuilts
2021-10-18 19:48:10 -05:00
Michael Simons
3808a1300d
Merge pull request #12435 from dagood/refpack-aspnetcore
[release/6.0.1xx] dotnet/aspnetcore: Enable targeting pack build during source-build
2021-10-18 18:12:27 -05:00
msimons@microsoft.com
98396fc664 Resolve arcade nuget prebuilts 2021-10-18 22:14:57 +00:00
Davis Goodin
82cfc6b0da dotnet/aspnetcore: Enable targeting pack build during source-build 2021-10-18 16:04:37 -05:00
Eric Erhardt
a1772c7f17 Add DotNetHost runtime patch.
This should only be necessary until https://github.com/dotnet/runtime/pull/60577 is merged.
2021-10-18 15:49:31 -05:00
Michael Simons
013df0fc30 Update source-build prebuilts and previous source-built 2021-10-18 02:16:38 +00:00
Logan Bussell
407de8d99d
add patches for building more roslyn projects 2021-10-15 22:52:59 +00:00
Sarah Oslund
92ad65ff51 Update mac conclusion UI string 2021-10-15 14:32:46 -07:00
Davis Goodin
7a06aeebbf
[release/6.0.1xx] Remove msbuild prebuilts using patches (#12369) 2021-10-15 15:35:44 -05:00
Logan Bussell
470202635d
[ArPow] Resolve dotnet/linker Mono.Cecil prebuilt with patch (#12372)
* add wip Mono.Cecil patches

* remove unnecessary linker patch

* add link to linker PR in patch
2021-10-15 11:35:06 -07:00
Michael Simons
78f35bc23c
Merge pull request #12391 from MichaelSimons/restore-arcade-patch
[ArPow] Restore arcade patch that was inadvertently removed
2021-10-15 13:23:48 -05:00
Dan Seefeldt
726687d926
[ArPow] Update aspnetcore to use built versions of analyzers (#12375)
* Update aspnetcore to use built versions of analyzers

* Move solution to repo project
2021-10-15 17:40:58 +00:00
msimons@microsoft.com
c694b83d08 Revert "Resolve conflicts in source-build patches"
This reverts commit e7cfd82155fd1f5054d89f8a03fd0b4b34d1f5e9.
2021-10-15 15:44:14 +00:00
MichaelSimons
f5eac06079 Resolve Microsoft.Extensions.CommandLineUtils prebuilt 2021-10-15 13:43:18 +00:00
Logan Bussell
0026f763ee
[ArPow] Resolve Microsoft.DotNet prebuilts for dotnet/roslyn (#12268)
* remove two prebuilts

* add link to roslyn PR in patch
2021-10-14 23:58:40 +00:00
Michael Simons
6653586696
Merge pull request #12370 from MichaelSimons/update-previous-source-build
Update source-build prebuilts and previous source-build
2021-10-14 14:47:50 -05:00
dotnet-maestro[bot]
e3a96ef1c7
[release/6.0.1xx] Update dependencies from dotnet/arcade (#12349)
[release/6.0.1xx] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21423-02 to 1.1.0-beta-21480-02 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Resolve conflicts in source-build patches

 - Resolve conflicts in source-build patches
2021-10-14 19:33:05 +00:00
Doug Bunting
6ff730a152
[release/6.0.1xx] Update Asp.Net templates (#12331)
* [release/6.0.1xx] Update Asp.Net templates
* Update GenerateBundledVersions.targets too
2021-10-14 10:41:17 -07:00
Michael Simons
f929db75b3 Update source-build prebuilts and previous source-build 2021-10-14 16:16:09 +00:00
dotnet-maestro[bot]
8b7247c58e
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12355)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21512.5 to 6.0.0-rtm.21513.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.8 to 6.0.0-rtm.21513.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rtm.21505.3 to 6.0.0-rtm.21512.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - Resolve source-build patch conflicts
2021-10-14 02:41:17 +00:00
Davis Goodin
032f3aab69
[release/6.0.1xx] Add short source-build dev README (#12292)
* Add short source-build dev README

* Describe patch creation process
2021-10-13 12:46:46 -05:00
sfoslund
0ceb3dcfa0 [release/6.0.1xx] Fix bad merge 2021-10-13 09:24:40 -07:00
Eric Erhardt
fa1573136d
Add runtime patches to eliminate pre-builts (#12318)
* Add runtime patches to eliminate pre-builts
2021-10-13 11:15:45 -05:00
Chris Rummel
e15beac0f6
Move Omnisharp fix to the correct place. (#12297)
* Move Omnisharp fix to the correct place.
We had some crossed PRs and this got added while the other patches were being moved.  This moves it to the correct place.

* Update patch to apply to new hash.

* Another project dependency.
2021-10-13 11:15:20 -05:00
dotnet-maestro[bot]
b10c4f72cd
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12336)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21512.3 to 6.0.0-rtm.21512.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21512.2 to 6.0.0-rtm.21512.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

 - Resolve source-build patch conflicts
2021-10-13 16:13:40 +00:00
Michael Simons
76b74717b7
Merge pull request #12319 from MichaelSimons/update-previous-SB2
Update prebuilts and previous source-build
2021-10-13 08:05:17 -05:00
MichaelSimons
3d2c179c2c Update prebuilts and previous source-build 2021-10-12 20:45:37 +00:00
MichaelSimons
c0f3461780 Enable all smoke-tests 2021-10-12 20:19:36 +00:00
Sarah Oslund
654e77182d
Merge pull request #12302 from sfoslund/UpdateManifestAuth
Update baseline manifest authoring for localization dir
2021-10-12 11:25:36 -07:00
Michael Simons
3a434f6fd7
Merge pull request #12271 from MichaelSimons/issue-2489
Handle workload manifests as text-only packages in source-build
2021-10-12 09:02:01 -05:00