Commit graph

1349 commits

Author SHA1 Message Date
Marc Paine
0bfde92839 Rename the files to lcl file extensions 2023-04-13 13:41:45 -07:00
Marc Paine
f6e04c22f6 Merge remote-tracking branch 'origin/main' into marcpopMSFT-addlcifile 2023-04-13 12:58:14 -07:00
Marek Fišera
30373420bd
Add KnownWebAssemblySdkPack to GenerateBundledVersions (#15951) 2023-04-06 21:08:03 +02:00
Forgind
38be1b1ed8
Change property name (#15907)
This means the package version property won't collide with MicrosoftNetCompilersToolsetPackageVersion, which is already in use for another package, albeit the core version of the same package.
2023-03-24 16:42:13 -07:00
Forgind
3ca0db8956
Generate version for Roslyn packages (#15216)
Co-authored-by: Forgind <Forgind@users.noreply.github.com>
2023-03-17 16:21:23 -07:00
wtgodbe
7318e092d0 Automate template updates into dotnet/installer 2023-03-13 14:11:48 -07:00
wtgodbe
67e4bf2cf0 Automate asp.net template updates into dotnet/installer 2023-03-13 14:07:05 -07:00
Jacques Eloff
920639343e Set ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch 2023-03-06 12:46:49 -08:00
Jason Zhai
448a42d109 Merge branch 'release/7.0.3xx' 2023-02-22 00:25:05 -08:00
Jason Zhai
5d9462454d Update implicit version for March release 2023-02-21 00:37:18 -08:00
Marc Paine
bcb30d460f Move the lci files directly next to the end files 2023-02-17 14:46:11 -08:00
Marc Paine
72db4520ef Add lci files to filter localization 2023-02-10 16:20:29 -08:00
dotnet-maestro-bot
702bf607cc
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15506)
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-10 15:49:21 -08:00
Sven Boemer
8ce7bb903a
Update illink version (#15484) 2023-02-10 08:35:16 -08:00
Jo Shields
15a73ed7d6
Only skip MAUI manifests on source-build (#15485) 2023-02-09 13:53:27 -06:00
Jason Zhai
13dae8f6ee Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-02-08 00:38:38 -08:00
Matt Mitchell
b12473af7b
Update checksum generation order (#15397)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-07 09:01:26 -08:00
dotnet bot
8537219bc2
Localized file check-in by OneLocBuild Task: Build definition ID 1224: Build ID 2104089 (#15354)
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-03 22:47:26 +00:00
Larry Ewing
e92432d688 Bump emsdk to preview1
Update workload featureband logic
2023-01-31 19:09:42 -06:00
Larry Ewing
711b595a27 Work around the feature band breakage for now 2023-01-31 14:02:50 -06:00
Larry Ewing
6caeedd097
[main] Fix MonoToolchain.Current naming and Update dependencies from dotnet/emsdk and dotnet/sdk (#15366)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
2023-01-31 02:53:16 +00:00
Drew Scoggins
59530fd164
Add selective unzipping to avoid ASP.NET clobbering NetCore.App (#15272) 2023-01-30 14:54:38 -08:00
Drew Scoggins
27521220b6 Address feedback 2023-01-30 11:04:13 -08:00
Drew Scoggins
5c969ccd3f Move NetCore.App item back to previous location 2023-01-30 10:55:02 -08:00
Sven Boemer
eee3d28220
Update illink versions (#15364) 2023-01-30 09:18:53 -08:00
Larry Ewing
0c1e55de6e Restore manifest order 2023-01-27 16:43:39 -06:00
dotnet-maestro[bot]
05a1cd2fc7
[main] Update dependencies from dotnet/sdk (#15346)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.23067.2 to 8.0.0-alpha.1.23075.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.23068.4 to 8.0.0-alpha.1.23076.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230123-01 to 17.6.0-preview-20230126-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-3.23070.7 to 4.5.0-3.23075.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.6.0-preview-23074-01 to 17.6.0-preview-23076-08 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.5.0-preview.3.136 to 6.5.0-rc.149 (parent: Microsoft.NET.Sdk)

 - Fix MSI manifest resolution

 - Clean up old code

 - Condition manifest MSI nupkgs for Windows

 - Move MSI calculation into targets

 - Remove razor patch.

 - Update dependencies from https://github.com/dotnet/emsdk build 202301… (#15361)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-01-27 19:33:45 +00:00
Drew Scoggins
c1a4771218 Change approach to only extract files that match criteria 2023-01-26 16:04:14 -08:00
Marc Paine
534ad63614
Enable the loc build for installer (#15334) 2023-01-24 16:33:57 -08:00
Marc Paine
3d60ffefdb Merge branch 'marcpopMSFT-enablelocbuild' into marcpopMSFT-enablelocbuildmain 2023-01-20 16:43:32 -08:00
Marc Paine
5bf5f3bbbc
Suppress noisy RAR messages to see if that cleans up the logs some (#15253) 2023-01-19 14:58:17 -08:00
dotnet-maestro[bot]
8db7870976
[main] Update dependencies from dotnet/arcade (#15130)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2023-01-18 11:18:03 +01:00
Marc Paine
2e8eefd722
Stable branding for 7.0.200 GA (#15277) 2023-01-17 14:49:58 -08:00
Marc Paine
d6c8188ab4
Update implicit versions for Jan release 2023-01-13 15:45:51 -08:00
Marc Paine
8fd65d532e Update implicit versions 2023-01-13 15:44:57 -08:00
Přemek Vysoký
2e488c8320
Add a script for exporting VMR as a source archive (#15226)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-01-13 08:55:44 -06:00
Jason Zhai
9250030044 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-01-12 22:15:06 -08:00
Drew Scoggins
0f4680522b Fix typo 2023-01-12 16:35:40 -08:00
Drew Scoggins
7ce6060eaa PR feedback 2023-01-12 15:45:00 -08:00
Drew Scoggins
376d01e55a Move NetCore.App package to the last step to avoid clobbering by other packages 2023-01-12 15:11:07 -08:00
Marc Paine
7402ac6199 Pass in the silent value rather than setting it to false explicitly. 2023-01-11 13:52:19 -08:00
Marc Paine
d75365e428
Fix the 7.0 default runtime version 2023-01-10 16:05:37 -08:00
Marc Paine
4f6839d512 Supress noisy RAR messages to see if that cleans up the logs some 2023-01-10 15:17:13 -08:00
William Godbe
683e859fad
Update GenerateBundledVersions.targets 2023-01-10 14:15:10 -08:00
Marc Paine
20892be849
use var.VersionMajor/Minor in installer (#15192) 2023-01-05 13:32:59 -08:00
dotnet-maestro[bot]
c125386cae
[main] Update dependencies from dotnet/sdk (#15151)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22602.3 to 8.0.0-alpha.1.22628.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22603.1 to 8.0.0-alpha.1.22631.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.5.0-beta.22612.4 to 12.5.0-beta.23053.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.1-beta.22612.4 to 7.0.1-beta.23053.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221214-01 to 17.6.0-preview-20230103-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22612.2 to 8.0.100-1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23053.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-22615-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.5.0-preview.3.130 to 6.5.0-preview.3.136 (parent: Microsoft.NET.Sdk)

 - Update ProjectBuildTests.cs

 - Don't crossgen ILLink which is no longer bundled

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Merge remote-tracking branch 'upstream/darc-main-e0248016-a57a-4ad2-aa0c-03ad8d093d6b' into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Add SuppressTfmSupportBuildWarnings=true in source-build

 - Merge branch 'darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Update GenerateLayout logic to use DotNetBuildFromSourceFlavor vs DotNetBuildOffline

 - Add CA nowarn workaround

 - --amend
2023-01-04 23:26:05 +00:00
kasperk81
694984e38b use var.VersionMajor/Minor in installer 2023-01-04 23:02:26 +00:00
Sven Boemer
fe452cf9cc
Add KnownILLinkPack to bundled versions (#15106)
Part of dotnet/linker#3029. With
https://github.com/dotnet/sdk/pull/29441/files, this will enable the
SDK to use a different version of illink depending on the TFM.

The latest 7.0 illink package is used when trimming net7.0 and
earlier, which matches the configuration we shipped in the .NET 7 SDK.

- The 7.0 version is taken from the latest 7.0 SDK branch:
   https://github.com/dotnet/sdk/blob/release/7.0.2xx/eng/Versions.props#L89.
- The 8.0 version is the latest in the SDK's main branch:
   https://github.com/dotnet/sdk/blob/main/eng/Versions.props#L88

These versions will quickly get out of date and need to be kept
updated. For the latest (8.0) version it would be possible to
set up dependency flow from linker -> installer to automate this, but
this will not be necessary after the linker move to dotnet/runtime, which will
allow us to use $(MicrosoftNETCoreAppRuntimePackageVersion) for the
latest illink pack.

Unfortunately the 7.0 version will still need manual updates. We might
want to consider changing our version numbers to match dotnet/runtime,
but AFAIK that will still be a manual process (to update the patch
number in the release/7.0 branch of dotnet/linker every SDK servicing
release).
2022-12-20 17:49:46 -08:00
Sven Boemer
094ab5eb7f Bump 8.0 version 2022-12-21 00:52:46 +00:00
Vlada Shubina
35bf9b1423 removed workaround in BundledTemplates.targets 2022-12-13 18:43:33 +01:00