Commit graph

4819 commits

Author SHA1 Message Date
Daniel Plaisted
d354b6a6e3
Merge pull request #13132 from EgorBo/extend-product-commit-txt
Save runtime commit to productCommit-rid.txt
2022-03-03 08:55:42 -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
87a7258c1f Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:29:14 -08: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
Matt Mitchell
a16c6b7e52
Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300 2022-02-22 14:50:14 -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
Marc Paine
b269da2525
Only do signcheck if there are files to sign check 2022-02-17 14:20:45 -08:00
Marc Paine
93495001d5
Remove MAUI manifests for now
MAUI is not yet supported for .net 7 so removing the manifests.
2022-02-17 13:35:54 -08: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
Egor Bogatov
69f4dcf849
Update GenerateBundledVersions.targets 2022-02-10 17:51:44 +03:00
William Godbe
1eace052fc
Update Asp.Net templates (#13195)
* Update Asp.Net templates

* Update GenerateBundledVersions.targets
2022-02-08 16:30: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
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
EgorBo
9469f5c7d1 address feedback 2022-02-05 23:56:28 +03:00
Marc Paine
738f121f8b Merge remote-tracking branch 'ADO/internal/release/6.0.2xx' into darc-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c 2022-02-04 21:03:53 -08:00
Marc Paine
2551ba7164 Merge remote-tracking branch 'ADO/internal/release/6.0.1xx' into darc-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c 2022-02-04 15:32:31 -08:00
Marc Paine
6efd1da62e
Fix up implicit versions 2022-02-04 15:13:25 -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
MichaelSimons
2d05a69434 Resolve source-build nuget patch conflict 2022-02-04 16:59:22 +00:00
Marc Paine
a7d8ea65b7
Switch source build package over to 6.0.200 manifests 2022-02-03 10:21:59 -08:00
Marc Paine
26b2dca100
Updated the runtime manifests 2022-02-03 10:21:04 -08:00
Jonathan Peppers
519c661235 Update manifests for MAUI Preview 13
Insertion: 38aa7894a1
Bump to: xamarin/xamarin-android/release/6.0.2xx-preview13@d23abbd7
Bump to: xamarin/xamarin-macios/release/6.0.2xx-preview13@88f54c5e
Bump to: dotnet/maui/release/6.0.2xx-preview13@8354ef23

The .NET MAUI workload manifests are now 6.0.200. This also uses the
builds we are tentatively shipping for Preview 13.

Note, that I think xamarin-macios had to adjust their version numbers
for other reasons. Their x.x.301 builds should align to 6.0.200.

After `.\build.cmd -pack -publish`, manually tested the workloads:

    > $env:DOTNET_MULTILEVEL_LOOKUP=0
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update
    Installing pack Microsoft.Android.Sdk version 31.0.200-preview.13.41...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install ios --skip-manifest-update
    Installing pack Microsoft.iOS.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maccatalyst --skip-manifest-update
    Installing pack Microsoft.MacCatalyst.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install macos --skip-manifest-update
    Installing pack Microsoft.macOS.Sdk version 12.1.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install tvos --skip-manifest-update
    Installing pack Microsoft.tvOS.Sdk version 15.2.301-preview.13.2...
    ...
    > .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --skip-manifest-update
    Installing pack Microsoft.Maui.Core.Ref.android version 6.0.200-preview.13.2747...
2022-02-03 10:56:15 -06: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
MichaelSimons
94780438c2 Resolve source-build NuGet.client patch conflict 2022-02-01 16:34:01 +00:00
MichaelSimons
6d6fe7d258 Remove source-build patches that were backported 2022-01-28 01:53:49 +00:00
dotnet-bot
6c72f4c37a Merge in 'release/6.0.1xx' changes 2022-01-27 21:17:36 +00: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
Egor Bogatov
1dc073731d
Update GetDependencyInfo.cs 2022-01-27 20:19:51 +03:00
EgorBo
8fa51f49e8 Save dependent dotnet/runtime's commit and version to productCommit-rid.txt 2022-01-27 19:21:52 +03:00
dotnet-maestro[bot]
542bf3308b
[main] Update dependencies from dotnet/sdk (#13114)
* Update dependencies from https://github.com/dotnet/sdk build 20220125.7

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.7

Dependency coherency updates

Microsoft.Build
 From Version 17.2.0-preview-22062-11 -> To Version 17.2.0-preview-22075-03 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.11

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.1 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.13

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.15

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22075.16

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.3 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.1

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.8 (parent: Microsoft.NET.Sdk

* Remove msbuld source-build patches that were backported

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.2

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.8 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.3

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.Build
 From Version 7.0.0-preview.2.22074.8 -> To Version 7.0.0-preview.2.22075.8 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.2.22075.6 -> To Version 7.0.100-preview.2.22076.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 7.0.0-preview.2.22075.2 -> To Version 7.0.0-preview.2.22075.11 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-01-26 20:31:28 -06:00
Marc Paine
16f3f632ad
Merge pull request #12981 from dotnet/darc-release/6.0.2xx-804c3b8c-7c2a-4109-a7c2-2d0451821142
[release/6.0.2xx] Update dependencies from dotnet/sdk
2022-01-25 10:56:21 -08:00
MichaelSimons
09bd338105 Resolve source-build patch conflicts 2022-01-25 15:17:59 +00:00
dotnet-bot
8b1c07967c Merge in 'release/6.0.1xx' changes 2022-01-25 04:17:40 +00: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
Marc Paine
babb2cda6e Switching to 7.0 test templates 2022-01-24 10:30:13 -08:00
dotnet-bot
d3374f5847 Merge in 'release/6.0.1xx' changes 2022-01-21 14:13:34 +00: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
Marc Paine
3bc1e6fc31 Update to the latest set of templates in the msi installer 2022-01-20 13:43:14 -08:00
dotnet-bot
30bae2948f Merge in 'release/6.0.1xx' changes 2022-01-20 20:42:24 +00:00
Michael Simons
b9540d3005
Remove unnecessary Arcade bootstrap patch (#13092) 2022-01-20 14:28:22 -06:00
dotnet-bot
746ca1351c Merge in 'release/6.0.1xx' changes 2022-01-20 16:02:36 +00: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
dotnet-bot
6771a8632c Merge in 'release/6.0.1xx' changes 2022-01-20 15:33:32 +00:00
Omair Majid
3e4f44cf23
Include musl bits in source-build bootstrap tarball (#13076) 2022-01-20 09:20:36 -06:00
Marc Paine
8247018438
Merge pull request #13087 from joeloff/finalizerPreviews
Workloads: Support for SxS previews
2022-01-19 14:32:29 -08: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
Jacques Eloff
1c933031f5 Workloads: Support for SxS previews 2022-01-19 09:17:41 -08: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
3023667922
Merge branch 'main' into merge/release/6.0.2xx-to-main 2022-01-18 13:24:48 -08:00
Marc Paine
20654c1908
Merge pull request #12976 from dotnet/marcpopMSFT-net7.0strings
Update all of the loc strings for net7.0
2022-01-18 13:22:21 -08:00
dotnet-maestro[bot]
0956ea6cb2
[main] Update dependencies from dotnet/arcade (#13058)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22057.1 to 1.0.0-beta.22065.1 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Remove source-build arcade patches that were backported
2022-01-18 16:55:59 +00:00
Alexander Köplinger
ee7e6073f4 Revert "Resolve msbuild source-build patch conflict"
This reverts commit 4b41693115.

We need the previous version after https://github.com/dotnet/sdk/pull/23421 was merged which downgraded msbuild back to the correct version.
2022-01-17 19:11:04 +01:00
dotnet-maestro[bot]
2bf3c588b9
[main] Update dependencies from dotnet/arcade (#13024)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.2.0-beta-21629-02 to 1.2.0-beta-22056-02 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22055.1 to 1.0.0-beta.22057.1 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Remove Arcade source-build patch that was backported
2022-01-14 18:46:56 +00:00
MichaelSimons
51a0225f80 Tweak source-build tarball build logic to skip offline in PR 2022-01-14 00:15:19 +00:00
Marc Paine
2f8d1c1e09
Merge pull request #12946 from dsplaisted/templates-7.0
Add .NET 7 templates
2022-01-13 14:55:38 -08:00
Marc Paine
d7821d002e
Merge branch 'release/6.0.2xx' into marcpopMSFT-merge601xx 2022-01-13 14:18:00 -08:00
Marc Paine
6f0f80e3aa
Update GenerateBundledVersions.targets 2022-01-13 14:08:42 -08:00
Marc Paine
e37de9afeb Switch to 7.0 packages for the console/classlib templates 2022-01-13 13:53:36 -08:00
Marc Paine
bf73601c7c
Merge pull request #12654 from mmitche/version-feature-60
Update 6.0 implicit versions
2022-01-13 13:43:22 -08:00
Marc Paine
5a82478394
Merge branch 'main' into templates-7.0 2022-01-13 11:16:59 -08:00
Marc Paine
0e9ba44271
Fix the DefaultRuntimeFrameworkVersion to be the .0 version 2022-01-13 11:03:14 -08:00
Marc Paine
ffe5d72008
Update GenerateBundledVersions.targets 2022-01-12 13:49:43 -08:00
MichaelSimons
80ac870557 Remove linker source-build patches that were backported 2022-01-11 14:25:47 +00: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
Logan Bussell
162b987fb4
remove runtime patch that was already addressed upstream 2022-01-10 16:46:15 -08:00
Michael Simons
f55e1448c8
Remove obsolete source-build tarball patches directory (#12995) 2022-01-10 15:32:01 -06:00
MichaelSimons
fbfe33b3f0 Revert "Remove linker source-build patches that were backported."
This reverts commit 2ce908597d.
2022-01-10 19:53:27 +00:00
dotnet-maestro[bot]
8c69614b67
[main] Update dependencies from dotnet/sdk (#12994)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20220105-03 to 17.2.0-preview-20220106-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-22055-02 to 17.2.0-preview-22057-09 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.22056.10 to 7.0.0-alpha.1.22058.4 (parent: Microsoft.NET.Sdk)

 - Resolve msbuild patch conflict
2022-01-10 15:55:28 +00:00
MichaelSimons
4b41693115 Resolve msbuild source-build patch conflict 2022-01-10 15:07:03 +00:00
MichaelSimons
2ce908597d Remove linker source-build patches that were backported. 2022-01-10 14:59:27 +00:00
Daniel Plaisted
b00ba9b79e Fix installertype path for patches 2022-01-06 17:46:04 -08:00
MichaelSimons
557fa0dc0d Remove source-build format repo patches that were backported 2022-01-06 17:06:09 +00:00
Marc Paine
a0cb77ed1e Update all of the loc strings for net7.0 2022-01-05 16:55:24 -08:00
Daniel Plaisted
c00686bf28 Add .NET 7 templates 2022-01-03 15:57:20 -08:00
Daniel Plaisted
5d414f0957
Merge branch 'main' into version-feature-60 2021-12-29 12:59:47 -08:00
dotnet-maestro[bot]
9b5623bee1
[main] Update dependencies from dotnet/sdk (#12866)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21617.2 to 7.0.100-alpha.1.21620.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21617.2 to 7.0.100-alpha.1.21620.1 (parent: Microsoft.NET.Sdk)

 - Remove obsolete sourcelink patch

It was merged upstream in https://github.com/dotnet/format/pull/1444
2021-12-20 18:36:40 +00:00
dotnet-maestro[bot]
58f9685dd5
[release/6.0.2xx] Update dependencies from dotnet/sdk (#12857)
* Update dependencies from https://github.com/dotnet/sdk build 20211216.6

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.6

Dependency coherency updates

VS.Redist.Common.WindowsDesktop.SharedFramework.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.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,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
 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.8

Dependency coherency updates

VS.Redist.Common.WindowsDesktop.SharedFramework.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.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
 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21615.7 -> To Version 6.0.200-preview.21616.10

Dependency coherency updates

VS.Redist.Common.WindowsDesktop.SharedFramework.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.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
 From Version 6.0.0-rtm.21523.1 -> To Version 6.0.1-servicing.21568.2 (parent: Microsoft.NET.Sdk

* 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

* Remove source-build patches that we backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2021-12-17 14:34:47 -06: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
Jason Zhai
3623697db0 Remove changes to file source-build-run-tarball-build.yml 2021-12-16 18:50:12 -08: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
Jason Zhai
3841d37fd7 Removed the annotation 2021-12-15 22:41:31 -08: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
Jason Zhai
1b305d19ef Merge branch 'release/6.0.2xx' into main 2021-12-14 22:36:07 -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
William Godbe
8b9782a074
Update asp.net templates (#12766)
* Update asp.net templates

* Update GenerateBundledVersions.targets
2021-12-14 22:56:20 +00: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
Marc Paine
2e29acc142 Fix the logic that generates the fallback text file 2021-12-14 10:40:55 -08: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
dotnet-maestro[bot]
d3ff42d64f
[release/6.0.2xx] Update dependencies from dotnet/sdk (#12757)
* Update dependencies from https://github.com/dotnet/sdk build 20211207.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.3

Dependency coherency updates

Microsoft.Build
 From Version 17.1.0-preview-21579-05 -> To Version 17.1.0-preview-21607-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.5

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.32

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.34

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.7

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.16

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.2

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

* Disable tarball build in PR validation

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-12-10 07:17:36 -08:00
Dan Seefeldt
65bbb444f8
Remove un-needed version properties (#12683) 2021-12-09 13:37:17 -06:00
MichaelSimons
e2ba170c3f Source-build patch edits 2021-12-07 14:42:00 +00:00
Jason Zhai
d73606388e Merge branch 'release/6.0.2xx' into main 2021-12-06 19:07:32 -08:00
Michael Simons
b10c4644ea
Re-enable web https smoke tests (#12739) 2021-12-06 20:50:23 -06:00
Michael Simons
b6a61fcd0d
source-build changes to support release/6.0.2xx (#12750)
* Update dotnet version used by source-build

* Additional source-build patches

* Bring in msbuild patch for committed changes that haven't flown
2021-12-06 17:17:53 -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-maestro[bot]
819d5f47a4
[main] Update dependencies from dotnet/sdk (#12716)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21568.1 to 7.0.0-alpha.1.21601.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21568.4 to 7.0.100-alpha.1.21601.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21566.2 to 7.0.0-alpha.1.21580.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.3 to 7.0.0-alpha.1.21580.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21580.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211118-03 to 17.1.0-preview-20211202-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21567.1 to 7.0.100-1.21601.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21568.1 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21579-12 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.1 to 7.0.0-alpha.1.21580.11 (parent: Microsoft.NET.Sdk)

 - Try using new dotnetbuilds asset root URI

 - !fixup! typo

 - Resolve msbuild source-build patch conflict

 - Merge branch 'darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-5f79afa4-8b96-43d6-a79b-6954e7183172

 - Resolve source-build conflicts w/format patches
2021-12-06 17:33:48 +00:00
dotnet-maestro[bot]
7002462283
[main] Update dependencies from dotnet/arcade (#12747)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.1-beta-21566-01 to 1.1.1-beta-21579-02 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Resolve source-build arcade patch conflict
2021-12-06 17:03:16 +00:00
dotnet-maestro[bot]
9df348884d
[release/6.0.2xx] Update dependencies from dotnet/sdk (#12727)
* Update dependencies from https://github.com/dotnet/sdk build 20211123.8

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.8

Dependency coherency updates

Microsoft.Build
 From Version 17.1.0-preview-21572-15 -> To Version 17.1.0-preview-21573-03 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.9

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.0.0-6.21526.21 -> To Version 4.1.0-2.21573.1 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.12

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.0.0-6.21526.21 -> To Version 4.1.0-2.21573.1 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21573.18

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.2

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.12

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.13

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.15

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.17

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21574.18

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.4

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.7

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211123-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.9

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21575.12

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21576.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21576.2

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211125-03 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21578.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211126-02 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.6

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21579.10

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.1

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.9

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21580.12

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21601.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211129-02 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21573.4 -> To Version 6.0.200-preview.21601.7

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 17.1.0-preview-20211122-02 -> To Version 17.1.0-preview-20211130-04 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-12-03 16:29:58 -06:00
MichaelSimons
1d34af8940 Resolve runtime source-build patch conflict 2021-12-03 15:31:25 +00:00
Daniel Plaisted
84fd6c272a Don't try to validate signing for workload manifests that will be signed as part of post-build signing 2021-12-02 16:46:53 -08:00
Daniel Plaisted
0d73a71a5a Merge changes from release/6.0.2xx 2021-12-02 15:38:30 -08:00
Daniel Plaisted
34239c96e5
Merge pull request #12741 from dsplaisted/merge-6.0.1xx-to-6.0.2xx
Merge 6.0.1xx to 6.0.2xx
2021-12-02 09:16:15 -08:00
Jason Zhai
c53c76678f Merge branch 'release/6.0.2xx' into main 2021-12-01 22:21:45 -08:00
Daniel Plaisted
564a442b9f Also update source build queues to Ubuntu 18 2021-12-01 21:03:35 -08:00
Marc Paine
66f6491592
Merge pull request #12702 from dsplaisted/AddExcludedRuntimeIdentifiers
Exclude ASP.NET  runtime packs from Android
2021-12-01 14:27:04 -08:00
Daniel Plaisted
b28ca80d75 Merge remote-tracking branch 'upstream/release/6.0.1xx' into merge-6.0.1xx-to-6.0.2xx 2021-12-01 10:31:37 -08:00
dotnet-maestro-bot
4de9a98981
[automated] Merge branch 'release/6.0.2xx' => 'main' (#12734)
* Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726)

[release/6.0.2xx] Update dependencies from dotnet/sdk

* source-build patches needed to get 6.0.2xx building (#12718)

* source-build patches needed to get 6.0.2xx building

* Patch to address msbuild prebuilts

* Remove conflicting backported patch

* Additional patches

* Additional vstest patch

* Workaround dev-cert issue in smoke-tests

Co-authored-by: dotnet-maestro[bot] <42748379+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-11-30 13:33:41 -06:00
Michael Simons
2ee0e6d76e
source-build patches needed to get 6.0.2xx building (#12718)
* source-build patches needed to get 6.0.2xx building

* Patch to address msbuild prebuilts

* Remove conflicting backported patch

* Additional patches

* Additional vstest patch

* Workaround dev-cert issue in smoke-tests
2021-11-29 08:43:14 -06:00
v-wuzhai
fbc5bbe6ea
Merge pull request #12706 from dotnet-maestro-bot/merge/release/6.0.2xx-to-main
[automated] Merge branch 'release/6.0.2xx' => 'main'
2021-11-22 20:13:06 -08:00
MichaelSimons
cf0d1025ac Resolve source-build patch conflict 2021-11-22 23:58:17 +00:00
Marc Paine
9d1187e909
Merge pull request #12675 from dotnet/marcpopMSFT-WDarm64targeting50main
Enable targeting 5.0 for arm64
2021-11-22 13:58:33 -08:00
Djuradj Kurepa
16c20efa9c
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2021-11-22 08:22:03 -08:00
Jason Zhai
464d8128d7 Merge branch 'release/6.0.2xx' into main 2021-11-18 19:11:54 -08: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
Daniel Plaisted
ce56d32622 Exclude ASP.NET runtime packs from Android 2021-11-17 16:45:06 -08: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
dotnet-maestro[bot]
4078d7d023
Merge pull request #12613 from dotnet/darc-release/6.0.2xx-1b244fc7-ac70-4eca-9fcf-17a28ef743e0
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-11-16 12:29:44 -08:00
Michael Simons
054be7f395
Merge pull request #12674 from mmitche/merge-from-2xx
[main] Merge from release/6.0.2xx
2021-11-16 13:06:29 -06:00
MichaelSimons
bbe021ff2b Resolve source-build patch conflicts 2021-11-16 18:19:09 +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
Matt Mitchell
0187877967 Merge remote-tracking branch 'upstream/release/6.0.2xx' into merge-from-2xx 2021-11-15 12:39:15 -08:00
Marc Paine
69022825a3 Update GenerateBundledVersions.targets 2021-11-15 12:39:02 -08:00
Marc Paine
1c4f356c21
Merge pull request #12614 from dotnet/marcpopMSFT-localizestrings
Localize DOTNET HOME strings
2021-11-15 12:38:06 -08:00
Alex Perovich
8c09aecb90
Port #12374 to release/6.0.2xx (#12635)
Add downloading of runtime assets from dotnetbuilds
2021-11-15 08:37:15 -08: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
Matt Mitchell
dcc0e61aa1 Update 6.0 implicit versions 2021-11-12 12:46:54 -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
Daniel Plaisted
9e40d10b11 Merge release/6.0.1xx into release/6.0.2xx 2021-11-11 12:36:42 -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
Daniel Plaisted
f835fd64af
Merge pull request #12516 from tmds/portable_rid_default
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture.
2021-11-10 09:54:10 -08:00
William Godbe
3ab6db321c
Update Asp.Net template versions (#12599)
* Update Asp.Net template versions

* Updated package name

Co-authored-by: Brennan <brecon@microsoft.com>
2021-11-10 09:18:16 -08:00
Jason Zhai
a86b293e8b Merge branch 'release/6.0.2xx' into main 2021-11-08 19:06:39 -08:00
Lee Coward
376f058e9e
Merge pull request #12618 from dotnet/leecow-snaps
update snap yaml to resolve libicu issues on some distros
2021-11-08 12:43:14 -08:00
Lee Coward
330750412c update snam yaml to resolve some issues 2021-11-08 11:14:11 -08:00
Djuradj Kurepa
8762385417 include System.Net.Http version 4.3.4 2021-11-08 10:41:56 +01:00
Marc Paine
dbb47fa43a
Update bundle.thm 2021-11-05 16:06:27 -07:00
Marc Paine
161a9dcde2 Enable the DOTNET HOME mesage to be localizable. 2021-11-05 15:11:40 -07:00
Marc Paine
ec997a96d0 Enable localization of some wxs strings 2021-11-05 11:48:22 -07:00
Marc Paine
86cb0ed124 Update the release notes link. 2021-11-05 11:11:00 -07:00
Djuradj Kurepa
4b5642d215 Change back to WindowsAzure.Storage and update the version to 9.3.3 2021-11-05 12:57:17 +01:00
Eric StJohn
bfabeefa4d
Remove install location from Windows conclusion (#12401)
* Remove install location from Windows conclusion

DOTNETHOME will not always be set in the bundle.
It's only set when an existing installation was present and the bundle is run.

As a result this string is sometimes empty.  Remove it to avoid confusion.

* Update src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

* Spanish

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
2021-11-04 13:16:14 -07:00
Marc Paine
e5cb4120c2
Update bundle.thm 2021-11-04 11:36:49 -07:00
Djuradj Kurepa
0336fa748e Resolve Microsoft.Data.OData Component Governance alert 2021-11-04 15:47:36 +01: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
Tom Deseyn
892222071f GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. 2021-11-03 15:12:59 +01:00
MichaelSimons
e460f22d3d Resolve source-build patch conflicts 2021-11-03 14:01:44 +00:00
Daniel Plaisted
082265dd3a Bundle workload manifests as separate MSIs 2021-11-02 23:39:27 -07:00
Jason Zhai
6caea3c847 Merge branch 'release/6.0.1xx' into main 2021-11-02 23:02:47 -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
MichaelSimons
eb7ff02c9a Resolve source-build patch conflicts 2021-10-29 15:40:17 +00:00
Jason Zhai
3d723365aa Merge branch 'release/6.0.1xx' into main 2021-10-28 23:16:31 -07:00
dotnet-maestro[bot]
b8e316fc5d
[main] Update dependencies from dotnet/sdk (#12552)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21525.5 to 7.0.0-alpha.1.21526.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)

 - Bump the mono toolchain workload to 7.0.100 band
2021-10-28 15:41:01 +00: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
Larry Ewing
5da38b603c Bump the sourcebuild emscripten manifest 2021-10-27 14:17:28 -05:00
Larry Ewing
e75d38f084 Use the incorrectly banded 7.0 mono workload for the moment 2021-10-27 14:01:52 -05:00
Larry Ewing
4040e3da0e Bump the workload feature band 2021-10-27 13:54:07 -05:00
Daniel Plaisted
cf467ab841
Merge pull request #12371 from dotnet-maestro-bot/merge/release/6.0.1xx-to-main
[automated] Merge branch 'release/6.0.1xx' => 'main'
2021-10-26 18:16:45 -07:00
Matt Mitchell
fd022a39be
Remove uneeded roslyn patch (#12531) 2021-10-26 17:21:57 -07:00
Chris Rummel
44f79fd7af
Remove runtime patch that is no longer rneeded. 2021-10-26 16:02:48 -05:00
Daniel Plaisted
cc60d4d858 Revert to released patch versions of 5.0 and 3.1 runtimes 2021-10-26 09:11:13 -07:00
Sarah Oslund
3b70c3266c Fix manifest generation merge 2021-10-25 12:56:39 -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
Alex Perovich
784dbe3afa
Merge pull request #12374 from dotnet/addDotNetBuilds
Add downloading of runtime assets from dotnetbuilds
2021-10-18 10:14:11 -07: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
Alex Perovich
003845e38f PR Feedback 2021-10-15 10:49:21 -07: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
Doug Bunting
38669b06cb
Don't update implicit versions this month (#12379)
- revert part of #12332
2021-10-15 00:26:53 +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
sfoslund
8318bb6f08 Merge remote-tracking branch 'upstream/main' into HEAD 2021-10-14 13:42:46 -07: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
Alex Perovich
1e9a661bbb Add downloading of runtime assets from dotnetbuilds 2021-10-14 12:13:40 -07:00
Doug Bunting
973613e911
[main] Update Asp.Net templates (#12332)
* [main] Update Asp.Net templates
* Update GenerateBundledVersions.targets too
2021-10-14 10:41:38 -07: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
Jon Fortescue
a10dba8712
Merge pull request #12236 from jonfortescue/1esPoolsMain
Switch to 1ES R&D pools on main
2021-10-13 14:26:32 -07: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
sfoslund
b5fc6e1f03 [main] Fix bad merge 2021-10-13 09:23:47 -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
Jason Zhai
1fb1cf6af5 Merge branch 'release/6.0.1xx' into main 2021-10-11 23:30:57 -07:00
MichaelSimons
ee7b08fdb6 Edit per code review 2021-10-12 02:23:02 +00:00
Sarah Oslund
ba5131fbf5 Update manifest authoring for localization dir 2021-10-11 16:13:35 -07:00
Dan Seefeldt
5cda6a56f9
Fix publish targets in vstest to eliminate prebuilts (#12294) 2021-10-11 17:36:10 -05:00
Davis Goodin
b7df57c2b4
[6.0.1xx] dotnet/arcade: Disable Workloads WiX dependency in source-build to remove prebuilt (#12290) 2021-10-11 15:08:32 -05:00
Michael Simons
b65fee00a5
Merge pull request #12287 from MichaelSimons/patch-cleanup
Remove source-build obsolete bootstrapping patches
2021-10-11 15:01:45 -05:00
dotnet-maestro[bot]
76be03c9ae
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12277)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21508.2 to 6.0.0-rtm.21509.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21507.10 to 6.0.0-rtm.21508.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21507.15 to 6.0.0-rtm.21508.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21507.14 to 6.0.0-rtm.21508.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21505.4 to 4.0.0-5.21508.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21508.5 to 6.0.0-rtm.21510.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.2.21474.1 to 6.0.0-rtm.21505.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - Resolve source-build patch conflicts
2021-10-11 16:43:10 +00:00
MichaelSimons
784fb8b996 Remove source-build obsolete bootstrapping patches 2021-10-11 16:18:40 +00:00
Daniel Plaisted
19a94a57ae
Merge pull request #12258 from dsplaisted/add-windows-22000
Add support for targeting Windows version 22000
2021-10-11 09:02:02 -07:00
MichaelSimons
aac9b44989 Add missing aspnetcore xml doc smoke-test exclusion 2021-10-11 14:02:29 +00:00
MichaelSimons
0cec6c187e Handle workload manifests as text-only packages in source-build 2021-10-08 19:39:22 +00:00
Michael Simons
c88205fd7e
Merge pull request #12245 from MichaelSimons/enable-tarball-ci
[ArPow] Re-enable source-build tarball PR validation
2021-10-08 09:22:24 -05:00
dotnet-maestro[bot]
bca0813ad9
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12263)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21505.4 to 6.0.0-rtm.21507.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21505.8 to 6.0.0-rtm.21507.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Build: from 17.0.0-preview-21501-01 to 17.0.0-preview-21507-06 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)

 - Resolve source-build patch conflicts

 - Merge branch 'darc-release/6.0.1xx-f658da10-b150-4bd3-8c2e-cb6d2453006b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-f658da10-b150-4bd3-8c2e-cb6d2453006b

 - Resolve source-build patch conflicts
2021-10-08 13:14:16 +00:00
MichaelSimons
39c6c2cb89 Disable offline and smoke-tests in CI 2021-10-08 12:17:17 +00:00
Chris Rummel
ae70ef3cf5
Temporarily disable package validation to prevent two tasks clashing and causing a file-in-use error. 2021-10-07 18:09:24 -05:00
Michael Simons
9ad6c2612e
Merge pull request #12255 from crummel/smokeTestPrereqs
[ArPow] Add smoke-test-prereqs to NuGet.config
2021-10-07 14:53:55 -05:00
Michael Simons
6e3ae6f5d6
Merge pull request #12256 from MichaelSimons/runtime-prereqs
Add runtime patch to enable host.pkg subset to eliminate prebuilts
2021-10-07 13:11:35 -05:00
dotnet-maestro[bot]
17811054ad
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12260)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21505.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21501.19 to 4.0.0-5.21505.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)

 - Resolve source-build patch conflicts
2021-10-07 15:51:06 +00:00
Eric StJohn
02135a7f42
[release/6.0.1xx] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#12259)
* Use WIX_NATIVE_MACHINE to detect native architecture of target machine

* Ensure we reference WIX_NATIVE_MACHINE property
2021-10-06 18:38:46 -07:00
Daniel Plaisted
e043659ed7 Add support for targeting Windows version 22000 2021-10-06 10:54:41 -07:00
Matt Mitchell
30b84b58d1
[release/6.0.1xx] Additional servicing fixes (#12084)
* Add an explicit dependency on the 6.0 project templates
These ship incrementally, so it's important to keep the dependencies separate from other templating dependencies

* Use the shared framework VS redist package version to find the windows desktop blobs
Using the targeting pack version is incorrect
2021-10-06 10:51:36 -07:00
Eric StJohn
888436b86b
Merge pull request #12254 from ericstj/useWixNativeMachine
Use WIX_NATIVE_MACHINE to detect native architecture of target machine
2021-10-06 10:18:51 -07:00
Matt Mitchell
626c09ea0d
Do not generate checksums for wixpdb files (#12195)
The corresponding wixpdbs aren't published
2021-10-06 09:05:46 -07:00
MichaelSimons
c53f76dc26 Add runtime patch to enable host.pkg subset to eliminate prebuilts 2021-10-06 16:00:13 +00:00
MichaelSimons
ca1402aefa Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into enable-tarball-ci 2021-10-06 15:18:06 +00:00