Commit graph

816 commits

Author SHA1 Message Date
William Li
e8fa33c840
Merge pull request #10037 from Forgind/create-precomputed-rar-cache
Introduce pre-caching into installer
2021-05-10 10:34:04 -07:00
Jonathan Peppers
09e16c978a Bump to Xamarin ci.main workload manifests
Context: https://github.com/dotnet/designs/pull/188/files#diff-8fcaa29d8e6f00b34b3cb1830d93f33e75f04424780a66a3c658c7021048e74fR125
Context: https://github.com/xamarin/xamarin-android/pull/5898
Context: https://github.com/xamarin/xamarin-macios/pull/11436

The Xamarin workload manifest packages have been renamed to have a `$(PackageId)` of:

    Microsoft.NET.Sdk.[platform].Manifest-6.0.100

The `dotnet` directory on disk is expected to contain:

    dotnet\sdk-manifests\6.0.100\Microsoft.NET.Sdk.[platform]\
        WorkloadManifest.json
        WorkloadManifest.targets

I manually tested `.\build.cmd -pack -publish` which produced
`artifacts\**\dotnet-sdk-6.0.100-dev-win-x64.exe`. After installing
it, I can see the "advertising manifest" feature seems to be working:

    > dotnet workload install microsoft-android-sdk-full --configfile NuGet.config
    Updated advertising manifest microsoft.net.sdk.android.
    Updated advertising manifest microsoft.net.sdk.ios.
    Updated advertising manifest microsoft.net.sdk.maccatalyst.
    Updated advertising manifest microsoft.net.sdk.macos.
    Updated advertising manifest microsoft.net.sdk.tvos.
    Failed to update the advertising manifest microsoft.net.workload.blazorwebassembly: microsoft.net.workload.blazorwebassembly.manifest-6.0.100 is not found in NuGet feeds https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json, https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json, https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
    Installing pack Microsoft.Android.Sdk version 11.0.200-ci.main.256...
    Writing workload pack installation record for Microsoft.Android.Sdk version 11.0.200-ci.main.256...
    Installing pack Microsoft.Android.Sdk.BundleTool version 11.0.200-ci.main.256...
    Writing workload pack installation record for Microsoft.Android.Sdk.BundleTool version 11.0.200-ci.main.256...
    Installing pack Microsoft.Android.Ref version 11.0.200-ci.main.256...
    Writing workload pack installation record for Microsoft.Android.Ref version 11.0.200-ci.main.256...
    Installing pack Microsoft.Android.Templates version 11.0.200-ci.main.256...
    Writing workload pack installation record for Microsoft.Android.Templates version 11.0.200-ci.main.256...
    Garbage collecting for SDK feature bands 6.0.100...
    Successfully installed workload(s) microsoft-android-sdk-full.

Then I'm able to build and run an Android application using the installed workload:

    > dotnet build HelloAndroid -t:Run
    ...
    Build succeeded.
        0 Warning(s)
        0 Error(s)
    Time Elapsed 00:00:21.76
2021-05-06 14:54:08 -05:00
Forgind
00a58f35a7
Merge branch 'main' into create-precomputed-rar-cache 2021-05-05 09:31:28 -07:00
Jacques Eloff
3c87114e6d
Optional Workload: Finalizer (#10356)
MSI finalizer to remove optional workloads when uninstalling the SDK.
2021-05-04 20:55:39 -07:00
Nathan Mytelka
50a33e74cf Ignore assembly conflict warnings 2021-04-28 17:25:39 -07:00
Marc Paine
134dcdac41
Remove the duplicate implicit version properties 2021-04-28 11:54:16 -07:00
Nathan Mytelka
93b2806b0a Merge branch 'main' of https://github.com/dotnet/installer into create-precomputed-rar-cache 2021-04-28 10:45:26 -07:00
Nathan Mytelka
078be5a2d1 Change searchpath 2021-04-27 22:38:21 -07:00
Sarah Oslund
f74a415e62 Update manifest installer authoring to allow for data dir 2021-04-26 15:24:30 -07:00
Nathan Mytelka
b956cb7a9f Switch to calling RAR directly 2021-04-26 12:27:53 -07:00
Nathan Mytelka
0a135650c2 Switch to using stage 0 sdk 2021-04-26 11:31:16 -07:00
Nathan Mytelka
34dc6f4744 platform-specific executable 2021-04-19 16:15:30 -07:00
Marc Paine
a51cc90bad
Update GenerateBundledVersions.targets 2021-04-19 10:18:33 -07:00
Jason Zhai
c3f42ecccd Merge branch 'release/5.0.3xx' into main 2021-04-19 01:24:07 -07:00
Anton Lapounov
2455d34ceb
Extend the list of RIDs supported by Crossgen2 (#10250) 2021-04-18 19:19:05 -07:00
Bo Anderson
e4b1e681b5
Add macOS RIDs for crossgen2 (#10159) 2021-04-18 17:37:03 -07:00
Steve MacLean
c1eb61ac81
Apple Silicon Distribution-Template (#10223)
Add hostArchitectures attribute to stop installer from requiring Rosetta

Update the minimum required version to 11.0 for Apple Silicon
2021-04-15 16:42:30 -04:00
Sarah Oslund
c02505d316 Bump implicit versions to 3.1.14 and 2.1.27 2021-04-15 13:03:50 -07:00
Alexander Köplinger
4f02edc80b
Remove IsTrimmable from Mono KnownRuntimePack (#10231)
The assemblies themselves embed the trimmable information now, see 6c2b85564f
2021-04-15 20:39:03 +02:00
Alexander Köplinger
be57cb9130
Improve GenerateBundledVersions.targets to include only existing RIDs in KnownFrameworkReference (#10222)
Move the Mono-only rids to the KnownRuntimePack.
2021-04-15 10:22:30 +02:00
Igor Velikorossov
a069111a95
Update GenerateBundledVersions.targets (#10195) 2021-04-14 11:12:08 +10:00
Anirudh Agnihotry
174902835a
update the netcoreapp versions (#10208) 2021-04-13 16:23:11 -07:00
Marc Paine
fb77ff34fb
Merge pull request #10206 from akoeplinger/mono-runtimepacknames
Add KnownRuntimePack entries for Mono-based runtime packs
2021-04-13 13:16:48 -07:00
Alexander Köplinger
b75e498821 Add KnownRuntimePack entries for Mono-based runtime packs
We need this now that we changed the name of the Mono-based runtime packs.

See https://github.com/dotnet/sdk/pull/11824 for the design.

Fixes https://github.com/dotnet/sdk/issues/11227
2021-04-13 20:07:13 +02:00
Nathan Mytelka
4394dfd720 restore 2021-04-12 15:10:08 -07:00
Nathan Mytelka
e56d575703 Change path names
Other layout path was correct on debug but apparently wrong on Release.
2021-04-12 12:34:36 -07:00
Nathan Mytelka
dbcdf68b27 Merge https://github.com/dotnet/installer into create-precomputed-rar-cache 2021-04-08 14:53:40 -07:00
John Luo
5542708837 Update aspnetcore 2.1 & 3.1 & 5.0 template versions 2021-04-06 10:57:50 -07:00
Nathan Mytelka
216706e5b9 Update path and project 2021-04-05 14:45:06 -07:00
Jason Zhai
c01306370f Merge branch 'release/5.0.3xx' into main 2021-04-01 19:19:12 -07:00
Nathan Mytelka
509612827e Include all files and folders 2021-04-01 14:16:43 -07:00
Andy Gocke
196750992a
Switch to using non-internal packages (#10107)
After https://github.com/dotnet/runtime/pull/50434 we can depend on the non-internal
packages, which also contains the host.
2021-04-01 13:02:46 -07:00
Sarah Oslund
99b8a3a159 Update _AspNet31RuntimePackVersion to 3.1.13 2021-03-30 14:13:51 -07:00
Sarah Oslund
5cc7b5c054 Update implicit versions to 2.1.26 and 3.1.13 2021-03-30 14:03:16 -07:00
Sarah Oslund
1853dede26
Merge pull request #10036 from sfoslund/SdkManifestPkgs
Adding sdk manifests to pkg generation
2021-03-29 08:39:52 -07:00
dotnet-maestro[bot]
7876ef965a
[main] Update dependencies from dotnet/sdk (#10023)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.3.21167.1 to 6.0.0-preview.4.21176.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.3.21172.8 to 6.0.0-preview.4.21176.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.3.21161.1 to 6.0.100-preview.4.21176.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.3.21172.2 to 6.0.0-preview.4.21175.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.3.21171.2 to 6.0.0-preview.4.21174.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21172.2 to 6.0.100-preview.2.21174.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-2.21173.26 to 3.10.0-2.21175.26 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 16.10.0-preview-21173-01 to 16.10.0-preview-21175-01 (parent: Microsoft.NET.Sdk)

 - Remove Android, iOS, and macCatalyst from CA1416 analyzer warnings

 - Merge remote-tracking branch 'origin/main' into darc-main-3ea62347-a0cb-4e6d-8270-37add6b236fa

 - Missed property use
2021-03-26 23:45:47 +00:00
Nathan Mytelka
6eabc3b7d4 Introduce pre-caching into installer 2021-03-26 13:23:38 -07:00
sfoslund
9a0c551cff Adding sdk manifests to pkg generation 2021-03-26 12:49:34 -07:00
Marc Paine
73f77caa19
Merge pull request #10000 from dotnet/marcpopMSFT-updateMain
Updated installer files from master to main.
2021-03-26 10:53:29 -07:00
Jo Shields
a112bf8501
Rename iOS simulator targets from 'ios' to 'iossimulator' RID (#10029) 2021-03-26 12:43:00 +01:00
Andy Gocke
82a95978c4
Avoid duplicate txt files in official build (#10026) 2021-03-24 22:49:28 -07:00
Andy Gocke
a98263b0da
Add support for building a PGO installer copy (#9877)
Uses the uninstrumented profiling PGO bits from the runtime when the
'-pgoinstrument' flag is set.
2021-03-24 01:02:14 -07:00
Marc Paine
4ffebc1dac Updated installer files from master to main. Added a nuget.config so that the table generator will build. 2021-03-23 16:50:22 -07:00
Sarah Oslund
b69eb79398 Error on invalid workload content 2021-03-22 14:55:56 -07:00
Sarah Oslund
efe1496340 Fix workload manifest generation to handle case sensitive file systems 2021-03-22 13:31:24 -07:00
Sarah Oslund
afbd4fa212
Merge pull request #9935 from sfoslund/XamarinManifest
Adding workload manifests to installers
2021-03-18 15:05:04 -07:00
Sarah Oslund
1047ed5928 PR feedback 2021-03-18 09:16:13 -07:00
Anirudh Agnihotry
902afa1c51
add 3.0 & 5.0 template (#9914) 2021-03-14 10:11:09 -07:00
Sarah Oslund
02696474a1 Adding xamarin workload manifests 2021-03-12 10:00:04 -08:00
Sarah Oslund
dfe947054b Adding workload manifests to installers 2021-03-11 14:03:04 -08:00