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

746 commits

Author SHA1 Message Date
Daniel Plaisted
ce56d32622 Exclude ASP.NET runtime packs from Android 2021-11-17 16:45: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
Daniel Plaisted
9e40d10b11 Merge release/6.0.1xx into release/6.0.2xx 2021-11-11 12:36:42 -08: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
Marc Paine
dbb47fa43a
Update bundle.thm 2021-11-05 16:06:27 -07:00
Marc Paine
e5cb4120c2
Update bundle.thm 2021-11-04 11:36:49 -07:00
Tom Deseyn
892222071f GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. 2021-11-03 15:12:59 +01:00
Marc Paine
fbf342ea55
Update GenerateBundledVersions.targets 2021-11-02 10:31:01 -07: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
Matt Mitchell
7828a7f0f0
Temporarily revert implicit versions to produce new stage0 (#12492) 2021-10-22 09:57:48 -07:00
Sarah Oslund
92ad65ff51 Update mac conclusion UI string 2021-10-15 14:32:46 -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
sfoslund
0ceb3dcfa0 [release/6.0.1xx] Fix bad merge 2021-10-13 09:24:40 -07: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
Sarah Oslund
ba5131fbf5 Update manifest authoring for localization dir 2021-10-11 16:13:35 -07: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
0cec6c187e Handle workload manifests as text-only packages in source-build 2021-10-08 19:39:22 +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
Jacques Eloff
46fa4c306e
Update WiX to 3.14.0.5722 (#12252) 2021-10-05 15:50:59 -07: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
62b386e76b Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToGa 2021-10-01 09:11:25 -07:00
Ulrich Weigand
9ab241ff4c Add support for s390x architecture, part 2 
* Add linux-s390x RID for aspnetcore net6.0 to GenerateBundledVersions

* Add s390x build architecture in ArPow smoke-test.sh
 2021-09-29 18:15:59 +02:00
Eric StJohn
a6385f7be2 Remove writing InstallLocation from SDK, it will be handled by host 2021-09-27 09:27:18 -07:00
Daniel Plaisted
fdfc17e1e1
Merge pull request #12021 from dsplaisted/workload-userlocal-sourcebuild 
Create userlocal workload installation marker file for source build
 2021-09-23 13:49:10 -07:00
Matt Mitchell
d987f9696b
Include dotnethome WIXOBJ files during light command package drop creation (#12100) 
After https://github.com/dotnet/installer/pull/11843, post build signing started failing, failing to find one of the input wixobj files. The wixobj was not included in the wixpack. This is because the installer repo uses custom scripts to generate MSIs, rather than the arcade tasks (which would handle adding this transparently), so the input files need to be added explicitly.
 2021-09-23 10:15:01 -07:00
Jacques Eloff
912bf7a61b
Update WiX to signed build (#12078) 2021-09-23 08:57:00 -07:00
Daniel Plaisted
b81fb5892a Generate Mariner RPM 
Fixes #12077
 2021-09-22 16:08:55 -07:00
Eric StJohn
bc64430eef
Merge pull request #12022 from ericstj/6.0x64onARM64 
[release/6.0] x64 on ARM64 fixes
 2021-09-22 07:14:29 -07:00
Marc Paine
cce7929892
Merge pull request #11998 from dotnet/marcpopMSFT-rc2implicitversions 
Update implicit versions to target the October releases for RC2
 2021-09-21 14:37:38 -07:00
Sarah Oslund
a9c86cb905
Merge pull request #11813 from sfoslund/MacInstallersChoice 
Add x64 emulation support to pkg installers
 2021-09-20 15:52:41 -07:00
Sarah Oslund
94eb8849b7
Add comment for translation check 
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
 2021-09-20 14:39:37 -07:00
sfoslund
f2da3b6c6b Account for translated pkg execution 2021-09-20 14:24:00 -07:00
Daniel Plaisted
c534227572 Only write marker file for source-build, and use correct path 2021-09-20 12:10:59 -07:00
sfoslund
41187bde64 Fix typo in mac installer generation script 2021-09-20 08:50:15 -07:00
Daniel Plaisted
a9e2a941da Create userlocal workload installation marker file for source build 
Fixes https://github.com/dotnet/source-build/issues/2460
 2021-09-17 18:14:29 -07:00
Eric StJohn
18902cdebb Merge pull request #11843 from ericstj/x64onARM64 
Retarget DOTNETHOME when installing x64 on ARM64
 2021-09-17 17:59:01 -07:00
sfoslund
2016fa8577 Add comments to x64 machine detection script 2021-09-17 14:34:48 -07:00
sfoslund
e8ec98a819 Update x64 machine detection script 2021-09-17 13:53:42 -07:00
Ulrich Weigand
f1c05e42af Add support for s390x architecture 
* Add linux-s390x RIDs for net6.0 to GenerateBundledVersions

* Add s390x platform in Directory.Build.props

* Disable crossgen2 for the s390x target
 2021-09-17 22:47:29 +02:00
Marc Paine
5112087bfd
Update implicit versions to target the October releases for RC2 2021-09-16 10:46:49 -07:00
William Godbe
0d1cdfa6a0
Update Asp.Net templates & downlevel version features (#11933) 2021-09-15 16:33:59 +00:00
Matt Mitchell
c0c2ef891d
[release/6.0.1xx] Update arcade to build 105532 for Mariner rpm changes (#11939) 
* Update arcade to build 105532 for Mariner rpm changes

* Added import

* Update tfm version

Co-authored-by: Epsitha Ananth <epananth@microsoft.com>
 2021-09-14 16:05:46 -07:00
Matt Mitchell
1131a93542
[release/6.0.1xx] Tweaks for RTM stable building and servicing (#11938) 
* Tweaks for RTM stable building and servicing
- When building from source offline in a stable configuration, the shared frameworks versions will match the directory from which the runtime archives are located in, both stable. This is in contrast to when not building from source, in which the runtime archives will appear in non-stable directories.
- The targeting pack versions should not be assumed to always match the runtime framework versions, and the blob directories containing them are the same. Add new dependencies so that we can track where the targeting pack directory is over time.
- PGO archives coming from runtime are always built non-stable. This means the download location needs to be tweaks, and crossgen calls need to look for shared framework binaries in the non-stable locations.
- For source-build, the templating should move to a new non-stable dependency. This is used to determine the version of the source build intermediate package.

* Generate the full nuget version in the source build tarball job.
The source build tarball job needs the full nuget version so that it can publish the blob to the right location (`Sdk/<full version>/source-<stable version>.zip). This involves being able to call the GenerateFullNuGetVersion target and the targets it depends on.
 2021-09-13 12:01:04 -07:00
William Li
05f1624d9a Revert bad merge 2021-09-09 14:29:21 -07:00
William Li
9f0efebffa Merge remote-tracking branch 'origin/release/6.0.1xx-rc1' into merge-release/6.0.1xx-with-rc1 2021-09-09 14:25:25 -07:00