Commit graph

816 commits

Author SHA1 Message Date
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
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
Jason Zhai
3ba06f90de Merge branch 'release/5.0.2xx' 2021-02-09 19:03:15 -08:00
Michelle McDaniel
1baecf1295
Duplicate productVersion.txt with repo-specific name (#9666)
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-09 17:13:36 -08:00
Rolf Bjarne Kvinge
2e6685aae1
Add Mac Catalyst to the list of runtime pack IDs. (#9664) 2021-02-09 22:26:47 +01:00
Anirudh Agnihotry
19311cdf4a
update the 2.1/3/1/5.0 (#9675) 2021-02-09 13:08:43 -08:00
Cristiano Suzuki
118978636e Loc update 2021-02-08 17:54:42 -08:00
Brian Robbins
991ebff59c Remove analyzers from crossgen list. 2021-02-08 15:30:17 -08:00
Jeremy Koritzinsky
8a3c9ad911
Fix DebPackageToolPath. 2021-02-04 15:40:16 -08:00
Jeremy Koritzinsky
056c3db077
Use the package_tool.sh script that dotnet-deb-tool wraps directly and is maintained in Arcade instead of the old dotnet-deb-tool CLI tool package. 2021-02-04 14:46:38 -08:00
Brian Robbins
bf5d05cc4f Update list of assemblies to be crossgen'd. 2021-02-04 14:10:54 -08:00
Marc Paine
50bf980aa2
Merge pull request #9514 from dotnet/installer-text
Installer text improvements
2021-01-27 14:42:54 -08:00
William Li
b056ae09eb Merge branch 'release/5.0.2xx' into master 2021-01-25 21:40:24 -08:00
Pranav K
0215b1c135
Sign dotnet-watch files (#9539)
* Also react to changes to F# compiler
2021-01-25 15:12:48 -08:00
Marc Paine
91202bf011
Merge pull request #9525 from dotnet/marcpopMSFT-installerUI
Add an additional link to our documentation on the installer page
2021-01-24 15:36:44 -08:00
Juan Sebastian Hoyos Ayala
7fbfea47cc Mark ARM64 as a valid platform for WPF and WinForms and fix support bug
Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
2021-01-22 16:03:50 -08:00
Maira Wenzel
be2efe28fc
Installer text improvements 2021-01-21 15:38:02 -08:00
Marc Paine
c2e891d288 Add an additional link to our telemetry documentation 2021-01-21 13:02:53 -08:00
Marc Paine
596dd049d6 Add an additional link to our telemetry documentation 2021-01-21 13:01:45 -08:00
William Li
9cab6f6032 Merge branch 'release/5.0.2xx' into master 2021-01-21 10:11:11 -08:00
Pranav K
74e30f8d9c
Use dotnet-watch packed by the SDK (#9498) 2021-01-20 15:44:12 -08:00
Marc Paine
4367d06d57
Merge pull request #9477 from dotnet/marcpopMSFT-releasenoteslink
Update release notes link
2021-01-20 14:09:45 -08:00
Daniel Plaisted
34ed90f436
Merge pull request #9437 from dotnet/Update_windowsdesktop_versions
Update WindowsDesktop versions
2021-01-20 07:20:43 -08:00
Jan Vorlicek
7236ea48e0 [release/5.0.2xx] - Fix linux-musl-arm apphost
Port #9475 to release/5.0.2xx

The linux-musl-arm RID in the GenerateBundledVersions.targets was accidentally
added in Net50RuntimePackRids instead of Net50AppHostRids. That caused a wrong
host (linux-arm) to be extracted during dotnet publish.
2021-01-20 05:05:39 -08:00
Marc Paine
2e7e5600fe Update release notes link 2021-01-19 16:29:10 -08:00
Jan Vorlicek
03bb2be7fe Fix linux-musl-arm apphost
The linux-musl-arm RID in the GenerateBundledVersions.targets was accidentally
added in Net50RuntimePackRids instead of Net50AppHostRids. That caused a wrong
host (linux-arm) to be extracted during dotnet publish.
2021-01-19 16:03:05 -08:00
nohwnd
ff2d662408 Use 6.0 test-template, and remove NUnit because we bundle it in test templates 2021-01-18 13:43:17 +01:00
Igor Velikorossov
0d84694fdb fixup! Update WindowsDesktop versions 2021-01-18 14:19:10 +11:00
Igor Velikorossov
c346eb1e1a Update WindowsDesktop versions 2021-01-15 21:02:34 +11:00
Anirudh Agnihotry
4f056c0679
update Runtime Version (#9428) 2021-01-14 14:46:41 -08:00
William Godbe
8157d78e64
Update 2.1/3.1/5.0 Aspnetcore template versions (#9382) 2021-01-12 14:15:53 -08:00
David Karlaš
d69abb1ae5 Fix .NET 6 template missing for console, library...
Fixes https://github.com/dotnet/templating/issues/2740
2021-01-08 14:07:03 +01:00
Marc Paine
41a84a5ee1
Merge branch 'master' into bump-lastest-5.0-runtime 2020-12-17 10:57:15 -08:00
William Li
9c24da7934
Merge pull request #9198 from dotnet/wtgodbe/Templates501
Update AspnetCore template/runtime versions to 5.0.1
2020-12-17 09:34:40 -08:00
Will Godbe
489b5caeee Apply feedback 2020-12-16 14:38:51 -08:00
Jan Vorlicek
fb49c21816 [release/5.0.2xx] Enable linux-musl-arm* builds in CI
* Enable linux-musl-arm* builds in CI

* Revise recent build table

  Reorder platform table more naturally
  - Windows -> Linux -> Linux-musl -> RHEL -> macOS
  - x64 -> arm -> arm64

  Rename linux-musl -> linux-musl-x64
  Add linux-musl-arm* rows

* Generalize linux-musl-* code to include arm*

- Set /p:OSName='linux-musl'

* Fix linux-musl-arm crossgen logic

* Build linux-musl-arm on Ubuntu 18.04

* Add linux-musl-arm to .NET 5.0 RuntimePackRids
2020-12-13 17:28:29 +01:00
Larry Ewing
ab75328ef8 Bump _NET50RuntimePackVersion to 5.0.1 2020-12-10 15:32:33 -06:00
Daniel Plaisted
7d2413d106 Merge release/5.0.2xx into master 2020-12-10 03:03:23 -08:00
William Godbe
dc2d22f04e
Update GenerateBundledVersions.targets 2020-12-08 15:35:20 -08:00
William Godbe
8d0a196da7
Update GenerateBundledVersions.targets 2020-12-08 15:34:37 -08:00
Will Godbe
e5876e7119 Update AspnetCore template/runtime versions to 5.0.1 2020-12-08 10:50:54 -08:00
Daniel Plaisted
3a520ee2cd
Merge pull request #9106 from dsplaisted/create-rid-chain
Add more RuntimeIdentifier information to .NET SDK
2020-11-23 11:35:16 -08:00
eriawan
8f65ba49ad Fix version of .NET to be 6.0 on bundle.wxl 2020-11-23 03:43:44 +07:00
Daniel Plaisted
833bfd10b5
Apply suggestions from code review
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
2020-11-20 10:06:32 -08:00
Daniel Plaisted
096e69de3a Generate NETCoreSdkRuntimeIdentifierChain.txt in SDK folder 2020-11-20 00:42:41 -08:00
Daniel Plaisted
003b1d1d5c Add NETCoreSdkPortableRuntimeIdentifier to bundled versions 2020-11-20 00:42:14 -08:00
William Li
9d449decf8 Pin NETCoreAppTargetingPackBlobVersion
Since we no longer produce Targeting packs every build after 5.0.0
runtime release.
2020-11-19 10:33:56 -08:00
Steve MacLean
cfa5bc446d
Enable Apple Silicon SDK builds (#8990)
* Enable building osx-arm64
* Use osx-x64 NetStandardTargetingPack for osx-arm64
* Update readme for osx-arm64 SDK
2020-11-18 15:12:39 -05:00
dotnet-maestro[bot]
bb1e128c34
[master] Update dependencies from dotnet/sdk (#9064)
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20509.5 to 6.0.0-alpha.1.20560.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)

 - Update installer target framework to 6.0

 - Install 5.0.0 and 3.1.0 runtime

 - Merge remote-tracking branch 'upstream/master' into darc-master-4cce5096-36fd-4b94-ba12-5d198a821a27

 - Update SDK to one that targets 6.0

 - disable test as tool build for now

 - Fix aspnet runtime RID
2020-11-17 06:56:05 +00:00
dotnet-maestro[bot]
ebc9a69c8d
[release/5.0.2xx] Update dependencies from dotnet/sdk (#9062)
[release/5.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App: from 5.0.0-rtm.20529.4 to 5.0.1-servicing.20562.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0 to 5.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rtm.20529.3 to 5.0.1-servicing.20561.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rtm.20529.5 to 5.0.1-servicing.20561.15 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - NuGet.Build.Tasks: from 5.8.0-rc.6930 to 5.9.0-preview.1.6955 (parent: Microsoft.NET.Sdk)

 - Use non-stable location to find targeting pack version

 - Fix windows desktop base url
2020-11-13 01:19:00 +00:00
Matt Mitchell
197c79ff33
Update runtime and targeting pack versions (#9060)
Resolves https://github.com/dotnet/installer/issues/8974
2020-11-11 15:04:49 -08:00
Jeremy Koritzinsky
029081017e
Replace legacy packages with VS insertion packages for non-shipping version numbers. (#9059) 2020-11-11 13:48:35 -08:00
William Godbe
c5573dd579
Update 3.1 template versions from asp.net (#9043) 2020-11-10 14:54:42 -08:00
William Godbe
87f8351fcc
Update 3.1 template versions from asp.net (#9045) 2020-11-10 14:54:33 -08:00
Matt Mitchell
66ad9acda7 Merge remote-tracking branch 'upstream/release/5.0.1xx' into merge-from-5.0 2020-10-30 11:06:39 -07:00
Steve MacLean
01930deb2a
Enable linux-musl-arm* builds in CI (#8984)
* Enable linux-musl-arm* builds in CI

* Revise recent build table

  Reorder platform table more naturally
  - Windows -> Linux -> Linux-musl -> RHEL -> macOS
  - x64 -> arm -> arm64

  Rename linux-musl -> linux-musl-x64
  Add linux-musl-arm* rows

* Generalize linux-musl-* code to include arm*

- Set /p:OSName='linux-musl'

* Fix linux-musl-arm crossgen logic

* Build linux-musl-arm on Ubuntu 18.04

* Add linux-musl-arm to .NET 5.0 RuntimePackRids
2020-10-29 22:18:46 -04:00
Daniel Plaisted
0585bc66b2
Merge pull request #8973 from dsplaisted/knownframework-6.0
Add KnownFrameworkReference items for .NET 6
2020-10-28 10:55:30 -07:00
Daniel Plaisted
c5bc07d915 Apply code review feedback 2020-10-26 20:18:09 -07:00
Daniel Plaisted
9ec9fce35e Update tests for .NET 6 2020-10-25 19:19:57 -07:00
Daniel Plaisted
66318e6fc4 Switch to net5.0 and net6.0 spellings in BundledVersions 2020-10-25 17:46:32 -07:00
Daniel Plaisted
2c7d23afe9 Add KnownFrameworkReference items for .NET 6
Fixes https://github.com/dotnet/sdk/issues/13950
2020-10-23 13:19:43 -07:00
dotnet-maestro[bot]
f8eb583d40
[master] Update dependencies from dotnet/arcade (#8726)
* Update dependencies from https://github.com/dotnet/arcade build 20200924.4

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20474.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20200928.3

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20478.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20201006.7

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20506.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.SourceLink.GitHub,XliffTasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20201009.12

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 6.0.0-beta.20509.12

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.SourceLink.GitHub,XliffTasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20201020.8

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 6.0.0-beta.20520.8

Dependency coherency updates

Microsoft.SourceLink.GitHub,XliffTasks
 From Version 1.1.0-beta-20464-02 -> To Version 1.1.0-beta-20519-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update FileInfoAssertions.cs

* Update FileInfoAssertions.cs

* Use tasks provided by Microsoft.DotNet.Build.Tasks.Installers when provided.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
2020-10-23 09:44:02 +02:00
Juan Hoyos
b45ea003fa
Include WindowsDesktop assets in the arm64 bundled installer (#8965)
* Revert "Create ARM64 verision of bundle theme file to account for lack of WindowsDesktop support"
This reverts commit d590b93a1b.

* Include WindowsDesktop assets in the arm64 bundled installer

* Download ARM64 WindowsDesktop msi
2020-10-22 21:01:47 -07:00
Daniel Plaisted
3c9f9f35dd
Merge pull request #8914 from dsplaisted/templates6.0
Add .NET 6 template packages
2020-10-22 12:25:32 -07:00
Daniel Plaisted
bd7b9127bf For templates that don't have 6.0 versions, put 5.0 versions in 6.0 template folder 2020-10-22 08:49:19 -07:00
Daniel Plaisted
20c40af16b Fix template PackageDownloads 2020-10-20 23:43:16 -07:00
Daniel Plaisted
e505707598 Refactor template packaging logic to reduce duplication 2020-10-20 21:32:16 -07:00
Daniel Plaisted
bc317938ab Fix cross-branch version number for templates 2020-10-19 12:26:10 -07:00
Daniel Plaisted
1f156bca3c Include 5.0 templates as well as 6.0 ones in layout 2020-10-16 16:24:23 -07:00
Daniel Plaisted
fb9545ecd3 Fix package download for 6.0 templates 2020-10-16 12:23:28 -07:00
Juan Hoyos
53d412f76f
Add "Add arm64 as a possible WinForms arch (#7457)" back (#8906)
This reverts commit a3fc14fd2e.
2020-10-16 09:39:31 -07:00
Daniel Plaisted
0626b90392 Merge upstream changes 2020-10-15 19:47:02 -07:00
Daniel Plaisted
702adede10 Add templates for .NET 6 2020-10-15 19:30:45 -07:00
Matt Mitchell
e8dddcc611
[release/5.0.1xx] Enable post build signing (#8764)
* Enable post build signing
Enables post build signing of installer by including the items that need to be signed
post build in an ItemsToSignPostBuild item group and moving the file signing information
into the Signing.props files.

Changes to in-build signing have been verified by taking a drop with the current in-build
structure and comparing the the signatures and strong name keys between files
in equivalent builds.

* Enable post build signing
Enables post build signing of installer by including the items that need to be signed
post build in an ItemsToSignPostBuild item group and moving the file signing information
into the Signing.props files.

Changes to in-build signing have been verified by taking a drop with the current in-build
structure and comparing the the signatures and strong name keys between files
in equivalent builds.

Co-authored-by: dotnet-bot <dotnet-bot@dotnetfoundation.org>
Co-authored-by: Christopher Costa <chcosta@microsoft.com>
2020-10-14 14:55:38 -07:00
Marc Paine
3505317780
Merge pull request #8775 from dotnet/marcpopMSFT-fixlinks
Fix github.io links
2020-10-14 14:39:29 -07:00
William Godbe
b4242c4896
Use SharedFx Redist package instead of Targeting Pack from AspnetCore (#8886) 2020-10-14 10:49:30 -07:00
William Godbe
69ee2fdd13
Use SharedFx Redist package instead of Targeting Pack from AspnetCore (#8887) 2020-10-14 10:44:55 -07:00
Doug Bunting
4c563d8b04
Update GenerateBundledVersions.targets 2020-10-13 12:30:21 -07:00
Daniel Plaisted
fa369e265f Update implicit versions for 3.1.9 and 2.1.23 releases 2020-10-05 16:02:49 -07:00
Marc Paine
1f5fc035c4 Fix github.io links. #8478 2020-10-01 11:52:12 -07:00
William Li
d538412053
Merge pull request #8672 from wli3/unsigned-file
Do not produce reference assembly for redist.dll
2020-09-22 21:17:49 -07:00
Jacques Eloff
2339fae27b
Merge pull request #8668 from dotnet/joeloff/SignRedist
Sign redist.dll
2020-09-22 16:29:50 -07:00
William Li
8cb5ffc7ec Do not produce reference assembly for redist.dll 2020-09-22 16:16:50 -07:00
Matt Mitchell
f56648180f
Use aspnetcore version suffix for template install directory (#8625)
This change is required for RTM stable builds. When stable versions are generated the CalculateTemplateVersions task will fail.

For .NET 3.x, installer is partially on arcade. It uses its own versioning model, but the arcade generated versions are actually set (specifically VersionSuffix). So even when stable builds are generated, VersionSuffix is available. It is unused when the aspnetcore template versions are stable.

For .NET 5, installer is now fully on arcade versioning, which means VersionSuffix is not set when stable versions are generated.

Instead of using installer's version suffix if aspnetcore's template versions are unstable, use the version suffix of the aspnetcore template versions. This subtley affects the installer directory of the templates:

If the aspnetcore version is: 5.0.0-rc.1.1234.5
And the installer version is: 5.0.100-rc.1.9999.9
Then:

Template install dir before this change: .dotnet\templates\5.0.0-rc.1.9999.9
Template install dir after this change: .dotnet\templates\5.0.0-rc.1.1234.5
Of note: The overall template layout doesn't make a ton of sense. The aspnetcore template version is used for the install directory, but many different templates are put in this directory, including some that have completely different versions.
2020-09-22 14:32:10 -07:00
Jacques Eloff
4973bec513 Sign redist.dll 2020-09-22 11:30:23 -07:00
Matt Mitchell
2e14d4e8b0
Fixes for stable builds (#8648)
- Enable the switch for stable builds
- Fixup the calculation of FullNugetVersion to not include the iteration if it is empty
2020-09-22 07:59:59 -07:00
dotnet-maestro[bot]
f88a69c889
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade (#8617)
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade


 - Update task location
2020-09-18 16:46:00 +00:00
Juan Hoyos
56b8088573
Merge branch 'release/5.0.1xx-rc2' into juhoyosa/arm64-bundled-installer 2020-09-16 12:54:37 -07:00
Juan Sebastian Hoyos Ayala
d590b93a1b Create ARM64 verision of bundle theme file to account for lack of WindowsDesktop support 2020-09-16 12:48:01 -07:00