Commit graph

920 commits

Author SHA1 Message Date
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
William Li
177dd73ea9 Copy manifests to deb and rpm 2021-08-31 13:24:29 -07:00
dotnet-maestro[bot]
d12ee190bc
[release/6.0.1xx] Update dependencies from dotnet/sdk (#11699)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rc.2.21420.26 to 6.0.0-rc.2.21427.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21423.5 to 6.0.100-rc.2.21426.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21423.3 to 6.0.0-rc.2.21427.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21423.1 to 6.0.0-rc.2.21427.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21423.3 to 6.0.0-rc.2.21427.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21418.3 to 12.0.0-beta.21426.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 5.0.3-beta.21418.3 to 5.0.3-beta.21426.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21420.19 to 4.0.0-4.21427.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21423-05 to 17.0.0-preview-21427-02 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21423.6 to 6.0.0-rc.2.21427.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0-rc.1.21419.1 to 6.0.0-rc.2.21425.6 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - Update stage0

 - Update package name for Microsoft.DotNet.Web.ItemTemplates
React to this commit in aspnetcore that updated the package name to be suffixed with the Major.Minor of the current release: 43f52607fa
2021-08-27 19:57:47 +00:00
dotnet-maestro[bot]
20f4afbf24
[release/6.0.1xx-rc1] Update dependencies from dotnet/sdk (#11700)
[release/6.0.1xx-rc1] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rc.1.21425.34 to 6.0.0-rc.1.21426.34 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.1.21426.4 to 6.0.100-rc.1.21426.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21426.1 to 12.0.0-beta.21426.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 5.0.3-beta.21426.1 to 5.0.3-beta.21426.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-4.21426.10 to 4.0.0-4.21426.21 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21425.15 to 6.0.0-rc.1.21426.17 (parent: Microsoft.NET.Sdk)

 - Update package name for Microsoft.DotNet.Web.ItemTemplates
React to this commit in aspnetcore that updated the package name to be suffixed with the Major.Minor of the current release: 43f52607fa
2021-08-27 19:45:35 +00:00
Marc Paine
a40a3df9fd
Update GenerateBundledVersions.targets (#11672) 2021-08-25 09:20:04 -07:00
Chris Rummel
f932fe8d77
[ArPow] Merge new repos to release/6.0.1xx (#11620)
* [ArPow] Add runtime repo to tarball (#11506)

* Add runtime repo / update runtime project

* Update runtime-portable logs and properties

* Create runtime-portable git-info

* Fix unpack of IntermediatePackages

* Re-enable references to runtime

* Pass TargetRid and NonPortable to runtime build

* Only build allconfigurations in non-portable build

* Add SDK patch to disable new CA warning

* Increase built tarball timeout

* Update prebuilt version

* [ArPow] Add installer repo to tarball (#11483)

* Ignore  failure in no-network case

Co-authored-by: Dan Seefeldt <dseefeld@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>
2021-08-23 22:05:58 +00:00
Sarah Oslund
7775f51a07 Add IncludedWorkloadManifest.txt 2021-08-18 15:39:36 -07:00
William Li
ecd26d75af
Merge pull request #11511 from dotnet-maestro-bot/merge/release/5.0.4xx-to-main
[automated] Merge branch 'release/5.0.4xx' => 'main'
2021-08-17 14:20:27 -07:00
Jacques Eloff
baf4e91918
Add MSI installer type file (#11539)
The sentinel file will trigger using the MSI based installation
2021-08-16 21:39:55 -07:00
Marc Paine
712d2da2be
Update GenerateBundledVersions.targets 2021-08-13 14:58:15 -07:00
Jason Zhai
57be651eca Merge branch 'release/5.0.4xx' into main 2021-08-12 23:40:36 -07:00
Marc Paine
24451549c5
Update GenerateBundledVersions.targets 2021-08-12 14:25:46 -07:00
Marc Paine
3f8b44d11b
Centralize bundled versions
Add a 50 bundled version as not all three were changing at once.  Modify the code to use the 31 and 21 versions.  This way, we only ever have to update one set of numbers each month rather than 3.
2021-08-12 14:12:39 -07:00
Anirudh Agnihotry
3ac06ffe3f
update netcoreapp versions (#11394) 2021-08-10 16:22:43 -07:00
William Godbe
34946d64f4
Update Asp.Net 2.1/3.1/5.0 Template version (#11393)
* Update Asp.Net 2.1/3.1/5.0 Template version

* Update GenerateBundledVersions.targets
2021-08-10 15:59:18 -07:00
Marc Paine
d47278a356 Merge remote-tracking branch 'origin/release/5.0.3xx' into marcpopMSFT-merge4xx 2021-08-09 13:26:18 -07:00
Matt Mitchell
9994b20baa
Changes for internal runtime build support for .NET 6 (#11422)
- Cherry pick the internal runtime download changes over
- Cherry pick changes to the arcade SB template over (making the next update a noop and unblocking P7+)
- Hoist out the variable groups and parameters needed for the internal download to the top level yaml file.
- Remove the old DownloadFile task and replace this with the Arcade version. Specifically this allows us to remove
  set/use of the DOTNETCLIMSRC_READ_SAS_TOKEN environment variable and instead rely on that task's ability to decode and
  use a base64 encoded SAS token. The reason for the environment variable usage before was that the
  non-encoded SAS token was getting mangled by msbuild/bash/etc. on non-Windows OSs.
- Update the source build tarball template with support for internal runtimes

Update to source build template
2021-08-06 13:54:33 -07:00
Marc Paine
37f7b1c4f9
Merge pull request #11162 from dotnet/marcpopMSFT-versionupdate
Update the minimum required verison in the installer UI to list 17.0 …
2021-07-21 14:31:14 -07:00
Matt Mitchell
cd2487150a
Do not create .zip files on Linux/Mac (#11188)
* Do not create .zip files on Linux/Mac
Avoid creating the .zip files on Linux/Mac, as they are not distributed or used in any scenario.
This saves > 20% of the total artifact size for this build (2.7 GB). Yay!

* Ensure output directories are created first
2021-07-21 14:05:33 -07:00
Marc Paine
1f5313fae3 Updated to say VS 2022 instead of 2019. 2021-07-20 11:26:01 -07:00
Marc Paine
60af8af7c4 Update the minimum required verison in the installer UI to list 17.0 as that's what we're officially supporting (even if we're not going to block 16.11) 2021-07-19 11:54:13 -07:00
Marc Paine
9cff60c3a6
Update GenerateBundledVersions.targets 2021-07-16 14:00:37 -07:00
Jason Zhai
76be4f93ad Merge branch 'release/5.0.4xx' into main 2021-07-14 23:28:19 -07:00
Devendar Reddy Adulla
2ec8242666
Merge pull request #11087 from dotnet/dev/dreddy/updatedesktopversion
Update WindowsDesktop servicing versions to 5.0.8
2021-07-14 13:47:54 -07:00
John Luo
47d09acf67
Update aspnetcore 3.1 & 5.0 template versions (#11086) 2021-07-14 13:23:33 -07:00
Devendar Reddy A
67fe759ed4 Update servcing versions 2021-07-08 09:52:34 -07:00
Larry Ewing
20e58082fa
Merge pull request #11060 from dotnet/darc-main-0a8e7e9b-f4e6-4c7d-85c7-02e9934e42ec
[main] Update dependencies from dotnet/sdk
2021-07-07 21:31:08 -05:00
Larry Ewing
c2d147c2c2 Add emscripten manifest 2021-07-07 09:35:42 -07:00
Jacques Eloff
ef74b6ca71
Ensure finalizer doesn't remove workloads during upgrades (#10999) 2021-07-07 08:04:20 -07:00
Marc Paine
4ed27616e4
Update GenerateBundledVersions.targets 2021-07-06 11:35:05 -07:00
kasperk81
b02f23cc21 Adapt to latest crossgen change 2021-06-29 23:20:34 +00:00
Marc Paine
60272f2aa6
Merge pull request #10631 from kasperk81/patch-2
Fix crossgen PlatformAssemblyPaths for rzc
2021-06-29 10:45:05 -07:00
Marc Paine
42045b06c1
Merge branch 'main' into marcpopMSFT-preview6flow 2021-06-25 16:03:19 -07: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