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

1017 commits

Author SHA1 Message Date
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
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
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
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
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
Tom Deseyn
892222071f GetRuntimeInformation.targets: determine PortableProductMonikerRid based on HostOSName and Architecture. 2021-11-03 15:12:59 +01: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
Larry Ewing
e75d38f084 Use the incorrectly banded 7.0 mono workload for the moment 2021-10-27 14:01:52 -05:00
Larry Ewing
4040e3da0e Bump the workload feature band 2021-10-27 13:54:07 -05:00
Daniel Plaisted
cf467ab841
Merge pull request #12371 from dotnet-maestro-bot/merge/release/6.0.1xx-to-main 
[automated] Merge branch 'release/6.0.1xx' => 'main'
 2021-10-26 18:16:45 -07:00
Daniel Plaisted
cc60d4d858 Revert to released patch versions of 5.0 and 3.1 runtimes 2021-10-26 09:11:13 -07:00
Sarah Oslund
3b70c3266c Fix manifest generation merge 2021-10-25 12:56:39 -07:00
Matt Mitchell
8ebb6a415b
Revert "Temporarily revert implicit versions to produce new stage0 (#12492)" (#12495) 
This reverts commit 7828a7f0f0.
 2021-10-22 12:33:41 -07:00
Matt Mitchell
7828a7f0f0
Temporarily revert implicit versions to produce new stage0 (#12492) 2021-10-22 09:57:48 -07:00
Alex Perovich
784dbe3afa
Merge pull request #12374 from dotnet/addDotNetBuilds 
Add downloading of runtime assets from dotnetbuilds
 2021-10-18 10:14:11 -07:00
Sarah Oslund
92ad65ff51 Update mac conclusion UI string 2021-10-15 14:32:46 -07:00
Alex Perovich
003845e38f PR Feedback 2021-10-15 10:49:21 -07:00
Doug Bunting
38669b06cb
Don't update implicit versions this month (#12379) 
- revert part of #12332
 2021-10-15 00:26:53 +00:00
sfoslund
8318bb6f08 Merge remote-tracking branch 'upstream/main' into HEAD 2021-10-14 13:42:46 -07:00
Alex Perovich
1e9a661bbb Add downloading of runtime assets from dotnetbuilds 2021-10-14 12:13:40 -07:00
Doug Bunting
973613e911
[main] Update Asp.Net templates (#12332) 
* [main] Update Asp.Net templates
* Update GenerateBundledVersions.targets too
 2021-10-14 10:41:38 -07:00
Doug Bunting
6ff730a152
[release/6.0.1xx] Update Asp.Net templates (#12331) 
* [release/6.0.1xx] Update Asp.Net templates
* Update GenerateBundledVersions.targets too
 2021-10-14 10:41:17 -07:00
sfoslund
0ceb3dcfa0 [release/6.0.1xx] Fix bad merge 2021-10-13 09:24:40 -07:00
sfoslund
b5fc6e1f03 [main] Fix bad merge 2021-10-13 09:23:47 -07:00
Sarah Oslund
654e77182d
Merge pull request #12302 from sfoslund/UpdateManifestAuth 
Update baseline manifest authoring for localization dir
 2021-10-12 11:25:36 -07:00
Michael Simons
3a434f6fd7
Merge pull request #12271 from MichaelSimons/issue-2489 
Handle workload manifests as text-only packages in source-build
 2021-10-12 09:02:01 -05:00
Jason Zhai
1fb1cf6af5 Merge branch 'release/6.0.1xx' into main 2021-10-11 23:30:57 -07:00
Sarah Oslund
ba5131fbf5 Update manifest authoring for localization dir 2021-10-11 16:13:35 -07:00
Daniel Plaisted
19a94a57ae
Merge pull request #12258 from dsplaisted/add-windows-22000 
Add support for targeting Windows version 22000
 2021-10-11 09:02:02 -07:00
MichaelSimons
0cec6c187e Handle workload manifests as text-only packages in source-build 2021-10-08 19:39:22 +00:00
Eric StJohn
02135a7f42
[release/6.0.1xx] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#12259) 
* Use WIX_NATIVE_MACHINE to detect native architecture of target machine

* Ensure we reference WIX_NATIVE_MACHINE property
 2021-10-06 18:38:46 -07:00
Daniel Plaisted
e043659ed7 Add support for targeting Windows version 22000 2021-10-06 10:54:41 -07:00
Matt Mitchell
30b84b58d1
[release/6.0.1xx] Additional servicing fixes (#12084) 
* Add an explicit dependency on the 6.0 project templates
These ship incrementally, so it's important to keep the dependencies separate from other templating dependencies

* Use the shared framework VS redist package version to find the windows desktop blobs
Using the targeting pack version is incorrect
 2021-10-06 10:51:36 -07:00
Eric StJohn
888436b86b
Merge pull request #12254 from ericstj/useWixNativeMachine 
Use WIX_NATIVE_MACHINE to detect native architecture of target machine
 2021-10-06 10:18:51 -07:00
Matt Mitchell
626c09ea0d
Do not generate checksums for wixpdb files (#12195) 
The corresponding wixpdbs aren't published
 2021-10-06 09:05:46 -07:00
Eric StJohn
9230a610cc Ensure we reference WIX_NATIVE_MACHINE property 2021-10-06 07:06:48 -07:00
Jacques Eloff
95a8272668 Update WiX to 3.14.0.5722 (#12252) 2021-10-06 07:01:07 -07:00
Eric StJohn
dad4407de3 Use WIX_NATIVE_MACHINE to detect native architecture of target machine 2021-10-06 07:01:07 -07:00
Jacques Eloff
46fa4c306e
Update WiX to 3.14.0.5722 (#12252) 2021-10-05 15:50:59 -07:00
MichaelSimons
8c6b87a808 Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into rc2-to-ga 2021-10-05 13:46:37 +00:00