Commit graph

650 commits

Author SHA1 Message Date
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
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
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
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
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
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
0996744cc0 spelling: implicit
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04: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
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
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