Commit graph

21972 commits

Author SHA1 Message Date
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
dotnet-maestro[bot]
62facc1027
Update dependencies from https://github.com/dotnet/arcade build 20211007.1 (#12262)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2021-10-07 18:45:24 +00:00
Omair Majid
b87ae17706
Document how to build source-build (#12242)
I have seen questions about this from some FreeBSD folks as well as some
folks at Red Hat. Let's just document it here.
2021-10-07 13:13:50 -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
3feb30d565 Add test for targeting Windows 22000 2021-10-06 10:57:55 -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
Matt Mitchell
b173b6979e
Update dotnet/diagnostics version (#12257)
Update the dotnet diagnostics version to a slightly newer version that incorporates a re-categorization of some dependencies there. This removes a cycle in the product
2021-10-06 17:05:17 +00:00
Matt Mitchell
5bcda60edd
Add source build tarball setup nuget feeds and remove unused group (#12080) 2021-10-06 16:15:22 +00: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
Łukasz Patalas
343ff37cc5
[release/6.0.1xx] Migrate to 1ES hosted pools (#12054) 2021-10-06 15:09:23 +02:00
Chris Rummel
620b231b83 Add smoke-test-prereqs to NuGet.config. 2021-10-05 20:58:17 -05:00
Jacques Eloff
46fa4c306e
Update WiX to 3.14.0.5722 (#12252) 2021-10-05 15:50:59 -07:00
dotnet-maestro[bot]
67fd8666c0
Dependency coherency updates (#12253)
[release/6.0.1xx] Update dependencies to ensure coherency
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
2021-10-05 22:38:04 +00:00
MichaelSimons
fce1e1b787 Re-enable tarball PR validation 2021-10-05 15:59:33 +00:00
Michael Simons
0c9bfe7eb1
Merge pull request #12244 from MichaelSimons/rc2-to-ga
Merging 6.0.1xx-rc2 to 6.0.1xx
2021-10-05 10:44:50 -05:00
MichaelSimons
8c6b87a808 Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into rc2-to-ga 2021-10-05 13:46:37 +00:00
Jacques Eloff
a151058157
Remove duplicate telemetry (#12243) 2021-10-05 00:15:42 -07:00
Michael Simons
056d280d35
Disable workload bundled manifests for source-build (#12231) 2021-10-04 16:43:30 -05:00
Sarah Oslund
81a59580a7
Merge pull request #12223 from sfoslund/MergeRc2ToGa
Merge 6.0.1xx-rc2 to 6.0.1xx
2021-10-04 14:39:18 -07:00
Chris Rummel
d19c0ef387
[SourceBuild] Add omnisharp fix patch (#12227)
* Add omnisharp fix path

* Address review comments.
2021-10-04 15:55:41 -05:00
MichaelSimons
3ebd16481b Resolve source-build patch conflicts 2021-10-04 20:41:51 +00:00
Sarah Oslund
26079651b0
Merge branch 'release/6.0.1xx' into MergeRc2ToGa 2021-10-04 13:04:00 -07:00
dotnet-maestro[bot]
457785c87e
Update dependencies from https://github.com/dotnet/sdk build 20211004.6 (#12237)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.9 to 6.0.0-rtm.21504.6 (parent: Microsoft.NET.Sdk)
2021-10-04 19:55:54 +00:00
MichaelSimons
b36ba0e039 Resolve source-build patch conflicts 2021-10-04 19:54:45 +00:00
sfoslund
6b92690374 Revert runtime commit sha change 2021-10-04 11:00:15 -07:00
Sarah Oslund
3430520a61
Merge branch 'release/6.0.1xx' into MergeRc2ToGa 2021-10-04 09:16:59 -07:00
dotnet-maestro[bot]
ec5186a482
Update dependencies from https://github.com/dotnet/sdk build 20211004.2 (#12229)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21501.8 to 6.0.100-rtm.21504.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21501.8 to 6.0.100-rtm.21504.1 (parent: Microsoft.NET.Sdk)
2021-10-04 14:13:52 +00:00
dotnet-maestro[bot]
4a7913e7af
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12219)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21479.18 to 6.0.0-rtm.21501.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21479.3 to 6.0.100-rtm.21501.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21479.3 to 6.0.100-rtm.21501.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21479.5 to 6.0.0-rtm.21501.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21479.3 to 6.0.0-rtm.21501.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21479.6 to 6.0.0-rtm.21501.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21477.4 to 12.0.0-beta.21501.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.0-beta.21477.4 to 6.0.0-beta.21501.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21479.8 to 4.0.0-5.21501.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21480-03 to 17.0.0-preview-21501-01 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21479.7 to 6.0.0-rtm.21501.9 (parent: Microsoft.NET.Sdk)

 - Update Docker image used in CI to fix cert issue (#12226)
2021-10-04 13:15:14 +00:00
Dan Seefeldt
7a78f60c47
[ArPow] Add option to bootstrap previously source-built packages (#12222)
* Add option to bootstrap previously source-built packages

This option modifies the previously source-built archive
to include portable packages that are downloaded from
a microsoft official feed rather than source-built.

* Remove working directory

* Add newlines

* Add additional comment about feeds

* Update source-build prebuilts

* Remove original archive rather than backup

Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-10-02 01:37:05 +00:00
Michael Simons
b05fc9c997
[ArPow] Add runtime patch to enable doc generation (#12221) 2021-10-01 23:13:54 +00:00
Michael Simons
6bcf16be37
[ArPow] Add runtime patch to produce symbol archives (#12220) 2021-10-01 21:57:11 +00:00
MichaelSimons
c2de8ab3be Disable tarball PR validation leg 2021-10-01 20:33:37 +00:00
Michael Simons
c5d2414c0f
Update source-build prebuilts (#12225) 2021-10-01 19:36:06 +00:00
sfoslund
fd52ef56df Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToGa 2021-10-01 11:28:50 -07:00
Michael Simons
18c7fa28d1
Update Docker image used in CI to fix cert issue (#12226) 2021-10-01 13:26:11 -05:00
MichaelSimons
7094f386a9 Disable offline source-build tarball CI 2021-10-01 18:21:43 +00:00
MichaelSimons
c2aa7e513e Correcting source-build related merge issues 2021-10-01 17:26:40 +00:00
Sarah Oslund
62b386e76b Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToGa 2021-10-01 09:11:25 -07:00
Marc Paine
1a3a3f9950
Merge pull request #12218 from dseefeld/udpateSBRP
Update dependency from dotnet/source-build-reference-packages
2021-09-30 15:28:55 -07:00
Marc Paine
b2fac072e4
Merge pull request #12217 from dotnet/darc-release/6.0.1xx-e4f9ec9a-ba63-4e3e-a47d-5239470566ac
[release/6.0.1xx] Update dependencies from dotnet/sdk
2021-09-30 15:27:17 -07:00
Marc Paine
0b61a78c5e
Merge pull request #12215 from jonathanpeppers/maui-preview-9
Update Maui/Xamarin manifests for .NET 6 RC 2
2021-09-30 15:27:07 -07:00
dotnet-maestro[bot]
4f7a7f370b Update dependencies from https://github.com/dotnet/sdk build 20210930.28
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21480.6 -> To Version 6.0.100-rtm.21480.28

Dependency coherency updates

Microsoft.Build
 From Version 17.0.0-preview-21480-01 -> To Version 17.0.0-preview-21480-03 (parent: Microsoft.NET.Sdk
2021-09-30 21:02:01 +00:00
dotnet-maestro[bot]
2c8037c4e6 Update dependencies from https://github.com/dotnet/sdk build 20210930.24
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21480.6 -> To Version 6.0.100-rtm.21480.24

Dependency coherency updates

Microsoft.Build
 From Version 17.0.0-preview-21480-01 -> To Version 17.0.0-preview-21480-03 (parent: Microsoft.NET.Sdk
2021-09-30 20:27:17 +00:00
dseefeld
4eef63c43c Update dependency from dotnet/source-build-reference-packages 2021-09-30 19:39:24 +00:00
dotnet-maestro[bot]
7504a1d507 Update dependencies from https://github.com/dotnet/sdk build 20210930.17
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21480.6 -> To Version 6.0.100-rtm.21480.17

Dependency coherency updates

Microsoft.Build
 From Version 17.0.0-preview-21480-01 -> To Version 17.0.0-preview-21480-03 (parent: Microsoft.NET.Sdk
2021-09-30 19:30:45 +00:00