Commit graph

22854 commits

Author SHA1 Message Date
MichaelSimons
c099a557b9 Add source-build patch to address arcade bootstrap issue 2022-02-18 15:33:14 +00:00
dotnet-bot
1c5d7bae9f Merge in 'release/6.0.1xx' changes 2022-02-18 15:02:16 +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
dotnet-bot
e6af362ffc Merge in 'release/6.0.1xx' changes 2022-02-18 06:16:49 +00:00
v-wuzhai
971f5ae3ae
Merge pull request #13241 from dotnet/darc-release/6.0.1xx-aaab3a90-c0e7-4ed7-bd01-4130ec9fe029
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-18 14:04:20 +08:00
dotnet-maestro[bot]
73fd7ac601 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.5
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.5
2022-02-18 02:57:43 +00:00
DotNet Bot
feeef451af [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
2022-02-17 17:48:04 +00:00
dotnet-maestro[bot]
102421b21d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.1
2022-02-17 16:32:24 +00:00
DotNet Bot
158aa38075 [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)
2022-02-17 01:35:46 +00:00
dotnet-bot
8b766d67fd Merge in 'release/6.0.1xx' changes 2022-02-17 01:17:26 +00: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
dotnet-bot
1c2cd414f5 Merge in 'release/6.0.1xx' changes 2022-02-16 22:06:58 +00:00
Michael Simons
f6763d6f6d
Gather additional smoke test prereqs (#13233) 2022-02-16 15:56:19 -06:00
dotnet-bot
fe7463b2f8 Merge in 'release/6.0.1xx' changes 2022-02-16 00:19:45 +00:00
dotnet-maestro[bot]
e63e925b57
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1 (#13229)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-16 00:07:45 +00:00
dotnet-bot
3f38e28b95 Merge in 'release/6.0.1xx' changes 2022-02-15 23:45:37 +00:00
Omair Majid
35abe3c7cf
Add CentOS Stream 9 container to CI matrix (#12955) 2022-02-15 23:35:05 +00:00
dotnet-bot
8773e2fc29 Merge in 'release/6.0.1xx' changes 2022-02-15 03:26:09 +00:00
Chris Rummel
606bca49cb
Update to SDK and previously-source-built 6.0.102. (#13221) 2022-02-15 03:12:25 +00:00
dotnet-bot
8d33a4878c Merge in 'release/6.0.1xx' changes 2022-02-10 22:10:07 +00:00
Michael Simons
d69361cbcf
Add test to compare msft and sb sdk contents (#13153) 2022-02-10 15:58:01 -06:00
dotnet-bot
58a94b14e6 Merge in 'release/6.0.1xx' changes 2022-02-10 19:14:45 +00:00
dotnet-maestro[bot]
2f89821757
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220210.1 (#13215)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-10 19:00:35 +00:00
dotnet-bot
ac5c41e2a9 Merge in 'release/6.0.1xx' changes 2022-02-09 18:41:58 +00:00
vseanreesermsft
69bd1f865f
Merge pull request #13189 from vseanreesermsft/internal-merge-6.0.1xx-2022-02-08-1019
Merging internal commits for release/6.0.1xx
2022-02-09 10:28:35 -08:00
dotnet-bot
051db0b2f4 Merge in 'release/6.0.1xx' changes 2022-02-09 00:42:19 +00:00
Marc Paine
b7a97cbabf
Merge pull request #13198 from manodasanW/patch-3
[release/6.0.1xx] Windows SDK projection update
2022-02-08 16:31:33 -08:00
William Godbe
ee9b80739f
Update asp.net templates (#13193) 2022-02-08 16:30:48 -08:00
Manodasan Wignarajah
583dcc4f28
[release/6.0.1xx] Windows SDK projection update 2022-02-08 13:14:46 -08: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
dotnet-bot
d4b8306885 Merge in 'release/6.0.1xx' changes 2022-02-08 16:33:32 +00:00
dotnet-maestro[bot]
b86d04b65d
Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13186)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-02-08 08:22:22 -08:00
dotnet-bot
038c9b2dc2 Merge in 'release/6.0.1xx' changes 2022-02-07 17:36:32 +00: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
dotnet-bot
e6da4e39b1 Merge in 'release/6.0.1xx' changes 2022-02-07 16:43:45 +00:00
dotnet-maestro[bot]
97c7aa240b
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 (#13179)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-02-07 16:31:47 +00:00
dotnet-bot
dde9bf359b Merge in 'release/6.0.1xx' changes 2022-02-06 17:52:52 +00:00
Marc Paine
11de58ddc5
Update .vsts-ci.yml 2022-02-06 09:41:11 -08:00
dotnet-bot
477d80b11b Merge in 'release/6.0.1xx' changes 2022-02-04 19:04:34 +00:00
Michael Simons
2842b74fd3
Refactor smoke-test to capture prereqs (#13145) 2022-02-04 12:52:30 -06:00
dotnet-bot
b39d25426d Merge in 'release/6.0.1xx' changes 2022-02-03 18:08:12 +00:00
dotnet-maestro[bot]
701b7698d6
Update dependencies from https://github.com/dotnet/arcade build 20220202.3 (#13164)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-02-03 17:55:02 +00:00
dotnet-bot
51188061a8 Merge in 'release/6.0.1xx' changes 2022-02-03 16:55:55 +00:00
dotnet-maestro[bot]
a1c6314717
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13163)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22078.1 -> To Version 6.0.0-servicing.22103.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-02-03 08:42:57 -08:00
dotnet-bot
c0cef1d17a Merge in 'release/6.0.1xx' changes 2022-02-03 14:15:24 +00: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
dotnet-bot
aa50e0d7a4 Merge in 'release/6.0.1xx' changes 2022-02-02 22:52:07 +00:00
Marc Paine
4469d93670
Merge pull request #13136 from dotnet/marcpopMSFT-poolversion601
Update poolversion
2022-02-02 14:41:21 -08:00
dotnet-bot
1e17c752e2 Merge in 'release/6.0.1xx' changes 2022-02-01 22:21:18 +00:00
vseanreesermsft
041c2d6658
Update branding to 6.0.103 (#13156) 2022-02-01 14:09:57 -08:00