mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22174 commits 41 branches 190 tags 95 MiB
Commit graph

22174 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Eric StJohn
9230a610cc Ensure we reference WIX_NATIVE_MACHINE property 2021-10-06 07:06:48 -07:00
Jacques Eloff
95a8272668 Update WiX to 3.14.0.5722 (#12252) 2021-10-06 07:01:07 -07:00
Eric StJohn
dad4407de3 Use WIX_NATIVE_MACHINE to detect native architecture of target machine 2021-10-06 07:01:07 -07: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
Jon Fortescue
c63a9f5490 Merge branch 'main' into 1esPoolsMain 2021-10-05 09:38:50 -07:00
Sarah Oslund
1a39c5ae6e
Merge pull request #12224 from sfoslund/MergeRc2ToMain 
Merge 6.0.1xx-rc2 to main
 2021-10-05 09:08:10 -07: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
Jon Fortescue
43a44557cb oops 2021-10-04 11:54:42 -07:00
Jon Fortescue
f5c955d584 Switch to 1ES R&D pools on main 2021-10-04 11:11:05 -07: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
sfoslund
f733b1efa8 Revert bundled templates change 2021-10-01 13:33:13 -07:00
sfoslund
423c4b45c2 Update wix version 2021-10-01 13:24:29 -07:00
sfoslund
569615ad4e Merge branch 'MergeRc2ToMain' of https://github.com/sfoslund/core-sdk into MergeRc2ToMain 2021-10-01 12:55:46 -07:00
sfoslund
021cc71d58 Revert versions changes 2021-10-01 12:55:25 -07:00
Michael Simons
c5d2414c0f
Update source-build prebuilts (#12225) 2021-10-01 19:36:06 +00:00
MichaelSimons
ad7094b0db Fix source-build merge conflicts 2021-10-01 19:21:21 +00:00
MichaelSimons
2f7c1a94d6 Disable offline source-build tarball CI 2021-10-01 18:36:48 +00:00
MichaelSimons
1af6f563f1 Correcting source-build related merge issues 2021-10-01 18:35:43 +00:00
sfoslund
a0c327cc2b Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToMain 2021-10-01 11:29:26 -07:00
sfoslund
fd52ef56df Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToGa 2021-10-01 11:28:50 -07:00