Commit graph

4071 commits

Author SHA1 Message Date
Marc Paine
42045b06c1
Merge branch 'main' into marcpopMSFT-preview6flow 2021-06-25 16:03:19 -07:00
Dan Seefeldt
832010fdf6
Initial checkin of source-build tarball build infrastructure (#10961)
* Initial checkin of source-build tarball build infra

* Add a couple more comments

* Update eng/SourceBuild.Version.Details.xml based on PR review

Co-authored-by: Chris Rummel <crummel@microsoft.com>

* Updates based on PR review comments

Co-authored-by: Chris Rummel <crummel@microsoft.com>
2021-06-24 16:36:04 -05:00
Marc Paine
e1265dbf74 Merge remote-tracking branch 'origin/release/6.0.1xx-preview6' into marcpopMSFT-preview6flow 2021-06-23 15:15:34 -07:00
Marc Paine
3b52bed9cf
Merge pull request #10837 from dotnet/RussKie-patch-1
Update Windows Desktop to 3.1.16 / 5.0.7
2021-06-23 15:12:14 -07:00
Marc Paine
1f024a0e0d
Merge pull request #10886 from dotnet/marcpopMSFT-CR
Update some older copyright strings to the correct MIT copyright.
2021-06-23 14:41:02 -07:00
Marc Paine
6eead57b89
Update GenerateBundledVersions.targets 2021-06-22 13:19:03 -07:00
Marc Paine
cf1c368d33
Merge branch 'main' into RussKie-patch-1 2021-06-22 13:16:56 -07:00
Pranav K
66e7c4cf3b
Modify GenerateLayout to work with runtime configs that contain more than one runtime (#10901) (#10947) 2021-06-22 19:25:10 +00:00
Marc Paine
85dd00be9d Update some older copyright strings to the correct MIT copyright. 2021-06-21 16:29:03 -07:00
Sarah Oslund
4d465d9c75
Merge pull request #10909 from jonathanpeppers/maui-workload
Add .NET MAUI workload manifest
2021-06-21 08:55:19 -07:00
Daniel Plaisted
556cf1f0f3 Fix call to DownloadFile 2021-06-18 15:09:20 -07:00
Daniel Plaisted
f67f6ba948 Merge 5.0.4xx into 6.0.1xx-preview6 2021-06-18 12:05:51 -07:00
Jonathan Peppers
507c44b7bf Add .NET MAUI workload manifest
Context: https://github.com/dotnet/maui/pull/603

After building with `.\build.cmd -pack -publish`, I could install the
workload:

    .\artifacts\bin\redist\Debug\dotnet\dotnet.exe workload install maui --verbosity diag
    ...
    Successfully installed workload(s) maui.

Next, I setup a `global.json` with `6.0.100-dev` and tried:

    .\artifacts\bin\redist\Debug\dotnet\dotnet.exe new maui

I was able to build and run the app, after some minor tweaks to the
template.
2021-06-17 11:39:16 -05:00
Pranav K
97675dbc5a
Modify GenerateLayout to work with runtime configs that contain more than one runtime (#10901) 2021-06-17 09:36:05 -07:00
dotnet-bot
303760f056 Merge in 'release/5.0.3xx' changes 2021-06-15 20:46:36 +00:00
Ryland Alaniz
d904dab19d Merged PR 15831: WindowsDesktop NET5 ARM64: Include WindowsDesktop ARM64 in the Installer (internal)
This is a cherry-pick of https://github.com/dotnet/installer/pull/10699 (which targets the public Installer repo, branch release/5.0.3xx) to the internal Installer repo, branch internal/release/5.0.3xx.

The public PR has been approved for 5.0.8 servicing.
2021-06-15 17:53:29 +00:00
Daniel Plaisted
ebfaa67375 Merge release/5.0.2xx into release/5.0.3xx 2021-06-15 10:37:05 -07:00
Daniel Plaisted
293c06da86
Merge pull request #10885 from dsplaisted/win-sdk-fe-5.0.2xx
Update Windows targeting information
2021-06-15 07:43:51 -07:00
William Godbe
9ad65fcd08
Decrement 2.1 patch version (#10897) 2021-06-14 14:31:26 -07:00
William Godbe
aae22b05c4
Decrement 2.1 patch version
To account for 2.1 not building this month
2021-06-14 13:24:27 -07:00
Manish Godse
959245b50a CR feedback 2021-06-13 17:47:24 -07:00
Manish Godse
bc6490c598 fix musl built on alpine 2021-06-12 01:55:58 -07:00
Manish Godse
1013c2b24d fix musl builds 2021-06-12 01:18:24 -07:00
Manish Godse
38a2c60199 Fix cross builds. 2021-06-11 22:54:54 -07:00
Manish Godse
d47b00d38d fix naming
Ah case sensitivity.
2021-06-11 22:10:31 -07:00
Manish Godse
ed9c92df3a propagate targetArch to crossgen2 2021-06-11 21:25:25 -07:00
Manish Godse
88b8fc6b33 replace crossgen with crossgen2
crossgen is now defunct. This is validated on windows x64. More work will be required to get it to work across OS/arch.
2021-06-11 21:11:16 -07:00
Daniel Plaisted
ca77109054 Add Windows targeting information in new format, bump package versions, add 20348 as targetable version 2021-06-11 10:58:45 -07:00
Sarah Oslund
41ef6e2cac Adding SDK manifests vs package 2021-06-09 12:57:17 -07:00
Anirudh Agnihotry
c7a34b1f74
update versions (#10833) 2021-06-09 09:10:52 -07:00
John Luo
5269cd79bb
Update aspnetcore 3.1 & 5.0 template versions (#10823)
* Update aspnetcore 3.1 & 5.0 template versions

* Update bundled versions
2021-06-08 12:37:16 -07:00
Igor Velikorossov
884c2af9e7
Update GenerateBundledVersions.targets
Update Windows Desktop to 3.1.16 / 5.0.7
2021-06-03 09:05:04 +10:00
Sarah Oslund
3ab5d1c2bf Merge remote-tracking branch 'upstream/release/6.0.1xx-preview5' into HEAD 2021-06-01 15:48:42 -07:00
Sarah Oslund
ef4abb849d Make baseline manifests lowercase 2021-05-27 09:04:12 -07:00
Jacques Eloff
411c1a4a6a
Remove optional workloads (#10780)
* Revert "Ensure copy latest runs on dotnet engine and not msbuild (#10766)"

This reverts commit d1be03eb6c.

* Revert "Publish additional files in official CI build"

This reverts commit 2e0eea8da3.

* Revert "Create WASM installers for optional workloads (#10685)"

This reverts commit 7c79ce28bc.
2021-05-27 04:19:10 +00:00
Matt Mitchell
e58843bebc
Remove Copy Blobs To Latest functionality and clean up some publishing (#10773)
- The stage has been subsumed by the aka.ms functionality and now can be removed.
- Clean up dead properties and functionality no longer needed because of it.
- Removing publishing of nupkg files as blobs. This used to be useful before because we often needed to get at the nupkgs in a flat, easy to copy format for pushing to the VS feed. But now the staging pipeline takes care of this, and moreover the use of post-build signing means that these files are not useful straight out of the build anyway. This should reduce publishing time and some post-build signing time.

Remove nupkg install in publishing.props
2021-05-26 15:13:19 -07:00
Josh Soref
b6273e1ec7 spelling: upgradability
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
d7f6b149d8 spelling: transform
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
3676a74548 spelling: parameters
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
16efdaacbb spelling: package
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
4a643533f3 spelling: occurred
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
0996744cc0 spelling: implicit
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
0e2bf5edbb spelling: during
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
544efe1f73 spelling: dependents
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
754334ccac spelling: crossgen
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
a97614f7e6 spelling: configuration
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:01:53 -04:00
Jacques Eloff
8d7dbce43d Create versioned folder for .vsman file 2021-05-25 01:53:47 -07:00
Jacques Eloff
2e0eea8da3 Publish additional files in official CI build 2021-05-24 21:31:56 -07:00
Jacques Eloff
7c79ce28bc
Create WASM installers for optional workloads (#10685)
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
2021-05-24 14:05:11 -07:00
Sarah Oslund
f63f994967 Remove VSRedistCommonNetCoreTargetingPackx6450PackageVersion property 2021-05-21 11:20:38 -07:00
Sarah Oslund
f2c71cd32d Merge remote-tracking branch 'internal/release/5.0.2xx' into Internal502To503 2021-05-21 10:59:41 -07:00
Jason Zhai
bb648ef774 Merge branch 'release/5.0.3xx' into main 2021-05-20 21:23:53 -07:00
Marc Paine
cc33950395 We were incorrectly includes .net core files and targets in the VS swr file. 2021-05-20 09:57:55 -07:00
Marc Paine
7f2f577a62 Downgrade implicit version because of no planned release for 2.1 in June. 2021-05-19 12:08:33 -07:00
kasperk81
15d1a0e8f1 Fix crossgen PlatformAssemblyPaths for rzc 2021-05-14 22:17:26 +00:00
dotnet-maestro[bot]
8af0a6ee4b
[main] Update dependencies from dotnet/sdk (#10625)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.5.21262.4 to 6.0.0-preview.5.21263.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.5.21262.4 to 6.0.0-preview.5.21263.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21263.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21263.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21263.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21263.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21263.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.5.21263.1 to 6.0.0-preview.5.21263.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.5.21263.4 to 6.0.0-preview.5.21264.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.5.21263.4 to 6.0.0-preview.5.21264.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.5.21263.4 to 6.0.0-preview.5.21264.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.5.21263.4 to 6.0.0-preview.5.21264.3 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.5.21263.4 to 6.0.0-preview.5.21264.3 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.5.21263.4 to 6.0.0-preview.5.21264.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.5.21263.2 to 6.0.100-preview.5.21264.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21262.4 to 6.0.0-preview.5.21263.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.5.21262.4 to 6.0.0-preview.5.21263.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.5.21262.3 to 6.0.0-preview.5.21263.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21263.6 to 4.0.0-2.21264.4 (parent: Microsoft.NET.Sdk)

 - Do not cross-gen rzc tool
2021-05-14 20:50:03 +00:00
Steve Pfister
032ca4ce5f
Add Mono workload baseline manifest (#10594)
This also replaces the Microsoft.NET.Sdk.BlazorWebAssembly.AOT workload
2021-05-14 16:23:45 -04:00
Marc Paine
2d88de2b5a
Update GenerateBundledVersions.targets 2021-05-13 10:24:49 -07:00
Sarah Oslund
a93abbb3e9 Keep aspnet targeting pack version 3.1.10 2021-05-12 15:11:40 -07:00
Sarah Oslund
0f2fd7baa7 Bump implicit version to 2.1.28 2021-05-12 14:53:43 -07:00
Marc Paine
bc4d460cf0
Merge pull request #10558 from dotnet/marcpopMSFT-UpdateMinVersionText
Update bundle.wxl
2021-05-12 14:19:17 -07:00
Sarah Oslund
0c03d8cce0 Update implicit versions 2021-05-12 12:54:12 -07:00
Marc Paine
faff70f02e Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. 2021-05-12 12:49:00 -07:00
Sarah Oslund
d74f5705b0
Merge pull request #10487 from sfoslund/SourceBuildPatches
Source build patches
2021-05-12 08:10:53 -07:00
William Godbe
34ce08ca0f
Update aspnet 2.1/3.1/5.0 template version (#10485) 2021-05-11 11:34:31 -07:00
Jacques Eloff
5bf91c20f7
Set SDK dependent value to include full semantic version (#10574) 2021-05-10 19:15:47 +00:00
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
Marc Paine
fbed36ef46
Update bundle.wxl 2021-05-07 15:35:22 -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
Sarah Oslund
13cd469c2d Include SdkResolver conditionally 2021-05-06 12:43:46 -07:00
Sarah Oslund
5b6eeb5038 Adding SDK resolver project back 2021-05-06 11:23:31 -07:00
Forgind
00a58f35a7
Merge branch 'main' into create-precomputed-rar-cache 2021-05-05 09:31:28 -07:00
Sarah Oslund
24d16965d9 Removing source build patches 2021-05-05 09:30:06 -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
Michael Simons
39fb1268ce Update GenerateMSI.targets build task ref to net5.0 2021-05-04 10:50:21 -07:00
Michael Simons
1d85104879 Exclude internal tarball from source-build 2021-05-04 10:50:15 -07:00
dseefeld
cc0fc0b795 Update blob versions to use ref pkg versions to track stable versions 2021-05-04 10:50:08 -07:00
dseefeld
a4959ad5c7 Don't restore WinForms and WPF templates for source-build. 2021-05-04 10:50:02 -07:00
Chris Rummel
8a535ee6ab Don't do this in source-build - aspnetcore-targeting-pack.tar.gz not available. 2021-05-04 10:49:56 -07:00
Chris Rummel
eccdd502cd ExcludeFromSourceBuild not working again 2021-05-04 10:49:48 -07:00
dseefeld
33f1944c6a Use PVP for PlatformAbstractions and NuGet.Versioning 2021-05-04 10:49:42 -07:00
Davis Goodin
c9e2ed40b9 Add target rid to NetCoreAppHostRids 2021-05-04 10:49:37 -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
Rahul Bhandari
b5d5fda0bc
Merge pull request #10210 from dotnet/rbhanda-patch-1
Update snaps for April releases
2021-04-28 11:51:35 -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
Rahul Bhandari
8adcebe113
Update snapcraft.yaml 2021-04-13 12:10:21 -07:00
Rahul Bhandari
58cdf0b124
Update snapcraft.yaml 2021-04-13 12:08:49 -07:00
Rahul Bhandari
9a0995a3e9
Update snapcraft.yaml 2021-04-13 12:07:36 -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
Marc Paine
e425b1dca0 We were incorrectly includes .net core files and targets in the VS swr file. 2021-03-30 10:24:17 -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
ee59b48e7b
Merge pull request #10015 from sfoslund/linuxManifests
Fix workload manifest generation to handle case sensitive file systems
2021-03-22 15:55:56 -07:00
Sarah Oslund
b69eb79398 Error on invalid workload content 2021-03-22 14:55:56 -07:00
Viktor Hofer
4cf1564639
Move dotnet-sdk snaps from dotnet/runtime (#9975)
* Move dotnet-sdk snaps from dotnet/runtime

Dotnet/runtime was the home of the snap files for both dotnet-runtime
dotnet dotnet-sdk snap files. Moving the dotnet-sdk snap files into
dotnet/installer next to the installers.

* Create CODEOWNERS
2021-03-22 21:51:25 +01: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
William Godbe
f7745cd74c
Update aspnetcore 2.1/3.1/5.0 template versions (#9821)
* Update aspnetcore 2.1/3.1/5.0 template versions

* Update GenerateBundledVersions.targets
2021-03-09 13:05:14 -08:00
dotnet-maestro[bot]
6c2b85564f
[master] Update dependencies from dotnet/sdk (#9846)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21124.3 to 6.0.100-preview.2.21125.1 (parent: Microsoft.NET.Sdk)

 - Don't set IsTrimmable on netcoreapp in 6.0

These assemblies now opt into trimming using AssemblyMetadata:
https://github.com/dotnet/runtime/pull/48428.

The SDK side of the change was made in https://github.com/dotnet/sdk/pull/16094.

For more context, see
https://github.com/mono/linker/blob/main/docs/design/trimmed-assemblies.md#net-6.
2021-03-02 00:54:23 +00:00
Matt Mitchell
95ef7ddfd3 Use VS redist targeting pack version for blob location 2021-02-23 17:12:42 -08:00
Matt Mitchell
23f416f8de Cherry-pick internal runtime download change 2021-02-23 16:43:00 -08:00
Jason Zhai
273a80d66e Merge branch 'release/5.0.2xx' 2021-02-17 22:18:27 -08:00
William Li
ad7e175e66 aspnet targeting pack does not move every release 2021-02-17 09:12:52 -08:00
Marc Paine
ac4b7d95d9 Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. 2021-02-16 14:22:17 -08:00
Michelle McDaniel
ed4165ce90
Duplicate productVersion.txt with repo-specific name (#9666) (#9708)
In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links.
2021-02-16 09:22:56 -08:00
Michelle McDaniel
533a174fe0
Duplicate productVersion.txt with repo-specific name (#9666) (#9709)
In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links.
2021-02-16 09:22:48 -08:00
Daniel Plaisted
e2f8d3b75c
Merge branch 'master' into merge/release/5.0.2xx-to-master 2021-02-11 16:32:49 -08:00
dotnet-maestro[bot]
5e82b73946
[master] Update dependencies from dotnet/arcade (#9663)
[master] Update dependencies from dotnet/arcade


 - Update path to Arcade tasks
2021-02-10 23:17:22 +00:00
Marc Paine
4abcb5d724
Merge pull request #9631 from jkoritzinsky/remove-dotnet-deb-tool-dep
Remove usage of dotnet-deb-tool
2021-02-10 14:44:38 -08:00
Marc Paine
a5eebdbb46
Merge pull request #9635 from brianrob/fix-crossgen
Update List of Assemblies to Crossgen
2021-02-10 14:44:04 -08:00
William Godbe
9c886537d9
Update 2.1/3.1/5.0 Aspnetcore template versions (#9680) 2021-02-10 09:06:43 -08:00
Igor Velikorossov
486a0abedb Update WindowsDesktop versions 2021-02-10 16:15:00 +11:00