mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
30946 commits 41 branches 190 tags 95 MiB
Commit graph

1349 commits

Author SHA1 Message Date
Daniel Plaisted
0d3f10e495
Merge pull request #12987 from dsplaisted/fix-installertype-location 
Fix installertype path for patches
 2022-01-10 16:58:14 -08:00
Daniel Plaisted
b00ba9b79e Fix installertype path for patches 2022-01-06 17:46:04 -08:00
Marc Paine
a0cb77ed1e Update all of the loc strings for net7.0 2022-01-05 16:55:24 -08:00
Daniel Plaisted
c00686bf28 Add .NET 7 templates 2022-01-03 15:57:20 -08:00
Daniel Plaisted
5d414f0957
Merge branch 'main' into version-feature-60 2021-12-29 12:59:47 -08:00
Jason Zhai
1b305d19ef Merge branch 'release/6.0.2xx' into main 2021-12-14 22:36:07 -08:00
William Godbe
8b9782a074
Update asp.net templates (#12766) 
* Update asp.net templates

* Update GenerateBundledVersions.targets
 2021-12-14 22:56:20 +00:00
Marc Paine
2e29acc142 Fix the logic that generates the fallback text file 2021-12-14 10:40:55 -08:00
Marc Paine
9979d00dd5 Fix the logic that generates the fallback text file 2021-12-10 10:10:05 -08:00
Daniel Plaisted
84fd6c272a Don't try to validate signing for workload manifests that will be signed as part of post-build signing 2021-12-02 16:46:53 -08:00
Daniel Plaisted
0d73a71a5a Merge changes from release/6.0.2xx 2021-12-02 15:38:30 -08:00
Daniel Plaisted
34239c96e5
Merge pull request #12741 from dsplaisted/merge-6.0.1xx-to-6.0.2xx 
Merge 6.0.1xx to 6.0.2xx
 2021-12-02 09:16:15 -08:00
Jason Zhai
c53c76678f Merge branch 'release/6.0.2xx' into main 2021-12-01 22:21:45 -08:00
Daniel Plaisted
b28ca80d75 Merge remote-tracking branch 'upstream/release/6.0.1xx' into merge-6.0.1xx-to-6.0.2xx 2021-12-01 10:31:37 -08:00
Marc Paine
9d1187e909
Merge pull request #12675 from dotnet/marcpopMSFT-WDarm64targeting50main 
Enable targeting 5.0 for arm64
 2021-11-22 13:58:33 -08:00
DotNet Bot
c296e85e33 Merged PR 19846: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.0-rtm.21567.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.0 to 6.0.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.0-rtm.21526.8 to 6.0.1-servicing.21567.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.0-rtm.21523.1 to 6.0.1-servicing.21567.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20211115.9
- **Date Produced**: November 15, 2021 7:50:53 PM UTC
- **Commit**: 7aff324297b3853a1cb198f92ec20f6bae9e2de5
- **Branch**: r...
 2021-11-18 17:54:25 +00:00
Daniel Plaisted
ce56d32622 Exclude ASP.NET runtime packs from Android 2021-11-17 16:45:06 -08:00
Michael Simons
054be7f395
Merge pull request #12674 from mmitche/merge-from-2xx 
[main] Merge from release/6.0.2xx
 2021-11-16 13:06:29 -06:00
Daniel Plaisted
d608d977da
Merge pull request #12657 from dotnet/marcpopMSFT-WDarm64targeting50 
Looks like our logic for the RID for WindowsDesktop was merged incorrectly into 6.0
 2021-11-15 18:48:57 -08:00
Matt Mitchell
0187877967 Merge remote-tracking branch 'upstream/release/6.0.2xx' into merge-from-2xx 2021-11-15 12:39:15 -08:00
Marc Paine
69022825a3 Update GenerateBundledVersions.targets 2021-11-15 12:39:02 -08:00
Marc Paine
1c4f356c21
Merge pull request #12614 from dotnet/marcpopMSFT-localizestrings 
Localize DOTNET HOME strings
 2021-11-15 12:38:06 -08:00
Alex Perovich
8c09aecb90
Port #12374 to release/6.0.2xx (#12635) 
Add downloading of runtime assets from dotnetbuilds
 2021-11-15 08:37:15 -08:00
Alex Perovich
86fe76957f
Port #12374 to release/6.0.1xx (#12636) 
Add downloading of runtime assets from dotnetbuilds
 2021-11-15 08:37:04 -08:00
Marc Paine
fb42fb7282
Update GenerateBundledVersions.targets 2021-11-12 13:47:22 -08:00
Matt Mitchell
dcc0e61aa1 Update 6.0 implicit versions 2021-11-12 12:46:54 -08:00
Daniel Plaisted
a329cf4049
Merge pull request #12600 from dsplaisted/workload-manifest-msis 
Bundle workload manifests as separate MSIs
 2021-11-11 13:10:09 -08:00
Marc Paine
56b2f07db1
Merge pull request #12550 from dotnet/marcpopMSFT-6.0branding 
Update to 6.0 in our wxl files as that was reverted a while back.
 2021-11-11 12:50:22 -08:00
Daniel Plaisted
9e40d10b11 Merge release/6.0.1xx into release/6.0.2xx 2021-11-11 12:36:42 -08:00
Daniel Plaisted
f835fd64af
Merge pull request #12516 from tmds/portable_rid_default 
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture.
 2021-11-10 09:54:10 -08:00
William Godbe
3ab6db321c
Update Asp.Net template versions (#12599) 
* Update Asp.Net template versions

* Updated package name

Co-authored-by: Brennan <brecon@microsoft.com>
 2021-11-10 09:18:16 -08:00
Jason Zhai
a86b293e8b Merge branch 'release/6.0.2xx' into main 2021-11-08 19:06:39 -08:00
Marc Paine
dbb47fa43a
Update bundle.thm 2021-11-05 16:06:27 -07:00
Marc Paine
161a9dcde2 Enable the DOTNET HOME mesage to be localizable. 2021-11-05 15:11:40 -07:00
Marc Paine
ec997a96d0 Enable localization of some wxs strings 2021-11-05 11:48:22 -07:00
Marc Paine
86cb0ed124 Update the release notes link. 2021-11-05 11:11:00 -07:00
Eric StJohn
bfabeefa4d
Remove install location from Windows conclusion (#12401) 
* Remove install location from Windows conclusion

DOTNETHOME will not always be set in the bundle.
It's only set when an existing installation was present and the bundle is run.

As a result this string is sometimes empty.  Remove it to avoid confusion.

* Update src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>

* Spanish

Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
 2021-11-04 13:16:14 -07:00
Marc Paine
e5cb4120c2
Update bundle.thm 2021-11-04 11:36:49 -07:00
Daniel Plaisted
2f331cfbc4 Verify that workload manifest MSIs are signed 2021-11-03 23:14:42 -07:00
Daniel Plaisted
590cbca7ea Include workload manifests wixobj file 2021-11-03 10:35:42 -07:00
Daniel Plaisted
3217a5c4a3 Remove ALLOWMSIINSTALL property for workload manifest MSIs 2021-11-03 09:41:43 -07:00
Daniel Plaisted
69a868b025 Only download workload manifest MSIs on Windows and not ARM 2021-11-03 09:40:39 -07:00
Daniel Plaisted
61774f69e8 Stop generating manifest MSI VS Redist NuGet package 
Reverts 41ef6e2cac
 2021-11-03 09:08:58 -07:00
Tom Deseyn
892222071f GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. 2021-11-03 15:12:59 +01:00
Daniel Plaisted
082265dd3a Bundle workload manifests as separate MSIs 2021-11-02 23:39:27 -07:00
Marc Paine
fbf342ea55
Update GenerateBundledVersions.targets 2021-11-02 10:31:01 -07:00
Jason Zhai
3d723365aa Merge branch 'release/6.0.1xx' into main 2021-10-28 23:16:31 -07:00
dotnet-maestro[bot]
b8e316fc5d
[main] Update dependencies from dotnet/sdk (#12552) 
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21525.6 to 7.0.0-alpha.1.21526.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21525.5 to 7.0.0-alpha.1.21526.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21526.9 to 7.0.0-alpha.1.21528.1 (parent: Microsoft.NET.Sdk)

 - Bump the mono toolchain workload to 7.0.100 band
 2021-10-28 15:41:01 +00:00
Marc Paine
168cfd8f98 Update to 6.0 in our wxl files as that was reverted a while back. 2021-10-27 16:39:26 -07:00
Larry Ewing
e75d38f084 Use the incorrectly banded 7.0 mono workload for the moment 2021-10-27 14:01:52 -05:00