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

3590 commits

Author SHA1 Message Date
Chris Rummel
db6496271c Don't overwrite AspNetCoreSharedFxInstallerRid if it's already set. (#4734) 2019-09-11 15:45:08 -07:00
Livar
0714086bdf
Fixing the channel for the master branch. 2019-09-11 14:48:13 -07:00
John Beisner
9d2ba908f0
Merge pull request #4638 from imba-tjd/patch-1 
LOC update for zh-cn and zh-tw
 2019-09-11 12:49:51 -07:00
Livar Cunha
0fa63a5fef Re-doing the merge of GenerateBundledVersion.targets. 2019-09-11 10:33:24 -07:00
Livar Cunha
5421af4ad6 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merges/release/3.1.1xx-to-master 
* upstream/release/3.1.1xx: (422 commits)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.12 (#4733)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.11 (#4731)
  Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.1 (#4729)
  [release/3.1.1xx] Update dependencies from dotnet/toolset (#4211)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#4728)
  Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions
  Add support for targeting .NET Core 3.1
  Update latest patch versions
  Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#4716)
  Do not download for 'arm*'
  Formatting...
  Download the ASP.NET SharedFramework MSI and the Module V2 MSI
  Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#4695)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.7
  Add release/3.1.xx download to readme (#4618)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.3
  Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#4667)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.10
  Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#4643)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.3
  ...

Conflicts:
README.md
eng/Version.Details.xml
eng/Versions.props
eng/common/native/install-cmake-test.sh
global.json
src/redist/targets/GenerateBundledVersions.targets
src/redist/targets/Versions.targets
 2019-09-11 10:09:32 -07:00
Daniel Plaisted
82c5e8502c
Merge pull request #4600 from dotnet/merges/release/3.0.100-preview9-to-release/3.0.1xx 
Merge release/3.0.100-preview9 to release/3.0.1xx
 2019-09-10 17:13:37 -07:00
Daniel Plaisted
ce3db2423f
Merge pull request #4721 from dsplaisted/support-3.1 
Support targeting .NET Core 3.1
 2019-09-10 16:04:06 -07:00
Daniel Plaisted
61d7005440 Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions 2019-09-10 15:03:12 -07:00
Daniel Plaisted
9931222c67 Update latest patch versions 2019-09-10 14:06:57 -07:00
Daniel Plaisted
827464d908 Add support for targeting .NET Core 3.1 2019-09-10 13:58:14 -07:00
Daniel Plaisted
724015cc60 Update latest patch versions 2019-09-10 13:53:43 -07:00
Livar
527312b4af
Fixing channel 2019-09-10 13:37:30 -07:00
jbeisner
b9ade4c05c Do not download for 'arm*' 2019-09-09 12:51:24 -07:00
jbeisner
cbafd9b1f4 Formatting... 2019-09-09 12:43:04 -07:00
jbeisner
01566ce154 Download the ASP.NET SharedFramework MSI and the Module V2 MSI 2019-09-09 12:38:32 -07:00
谭九鼎
5358c34cb7
Revert "Runtime" translation 2019-09-07 18:16:44 +08:00
谭九鼎
df3e5a9908
Update statement, add spaces, fix typo 2019-09-07 18:14:38 +08:00
Livar
8eedfce749
Updating branding to rc2 2019-09-05 12:41:56 -07:00
Livar Cunha
f0d988effa Fix the branch info information to use release/3.0.100-preview9. 2019-09-05 12:35:44 -07:00
Daniel Ye
8947097610 Localization update for PTB term changes. 2019-09-04 14:15:56 -07:00
jbeisner
0c67172baf Updates for 3.1.1xx 2019-09-03 14:33:11 -07:00
Matt Mitchell
6ef4a17f0e
Fix branch info in release/3.0.1xx branch 
Channel was changed incorrectly in https://github.com/dotnet/core-sdk/pull/4182/files
 2019-08-27 13:06:39 -07:00
Livar
2243a75129
Merge branch 'release/3.0.1xx' into merges/release/3.0.100-preview9-to-release/3.0.1xx 2019-08-27 10:43:09 -07:00
jbeisner
acd7d01676 Add height to the 'FailureRestartText' 2019-08-26 15:39:30 -07:00
William Li
f1c62d315e Correct branding 2019-08-23 13:41:03 -07:00
Matt Mitchell
7532bd3f62
Fix p9 branch channel. (#4179) 2019-08-22 15:58:51 -07:00
William Li
032926e8fc 3.1.1xx branding 2019-08-21 18:51:43 -07:00
Livar
b830442d62
Updating release/3.0.1xx branding to rc1. 2019-08-20 14:07:50 -07:00
John Beisner
fd4ebe6d48
Merge pull request #4069 from johnbeisner/VS-ARP-PlaceHolder 
SDK ARP Placeholder for Visual Studio
 2019-08-19 17:23:34 -07:00
jbeisner
daee0c40db Updates per code review. 2019-08-19 11:15:40 -07:00
jbeisner
c3ae4a64a8 Updates per code review. 2019-08-16 21:54:47 +00:00
jbeisner
9fe66e5c0f Adding 'ARPNOREPAIR' 2019-08-16 19:24:07 +00:00
jbeisner
e367a32ce4 Introducing a SDK ARP Placeholder for Visual Studio 2019-08-16 18:56:20 +00:00
Zbyněk Sailer
3c07d89244 LOC CHECKIN | dotnet/core-sdk master | 20190813 (#3982) 2019-08-15 10:17:08 -07:00
jbeisner
2d53cf29ec Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:43 -07:00
jbeisner
f797953741 Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:40 -07:00
Nick Guerrera
c37db568fe
Remove unused variables from bundled versions (#3742) 
These are replaced by the ImplicitPackageReferenceVersion items, and were mostly removed from 2.x:  

4158f5e94f
 2019-08-09 09:09:39 -07:00
jbeisner
c820b75ae8 Fixing a typo... 2019-08-08 12:37:16 -07:00
jbeisner
562adf13ea Updating the .NET Core installer welcome message. 2019-08-08 08:50:50 -07:00
Nick Guerrera
aca24e4ecb Fix RHEL test failure 2019-08-07 13:02:21 -07:00
jbeisner
a489af6341 Updating link; "Core" change to ".NET Core" 2019-08-06 09:12:39 -07:00
Nick Guerrera
81100b05d2 Use *.5.0 template packages 2019-08-05 15:12:49 -07:00
Nick Guerrera
ac2000cc03 Add netcoreapp5.0 support to bundled versions 
* Use 3.0-preview7 when targeting netcoreapp3.0 with 5.0 SDK for now
* Update known app host packs and framework references to 5.0
* Remove workaround for fixed bug from tests
* Temporarily expect run failure while templates are still at 3.0
 2019-08-02 22:19:00 -07:00
John Beisner
15fcfc5c6f
Merge pull request #3624 from johnbeisner/TemplateNupkgVersioning 
Standardize 2.1/2.2/3.0 templates NuPkg version
 2019-07-31 08:06:19 -07:00
Daniel Plaisted
c5a57d5805
Merge pull request #3576 from dsplaisted/crossgen-sdktasks 
Fix crossgen for SDK tasks and native image symbol publishing
 2019-07-30 18:09:46 -07:00
jbeisner
648c78a01e Use the SDK version as the NuPkg version for templates; remove superfluous WiX logic in the templates' MSI 2019-07-30 21:50:31 +00:00
Daniel Plaisted
446a3dc389 Change directory for native PDBs, so arcade should pick them up for publishing 2019-07-29 18:14:22 -07:00
Daniel Plaisted
3435d946ed Fix crossgen'ing .NET SDK build tasks 2019-07-29 18:13:54 -07:00
Livar
21de391bc1
Updating branding to preview9 2019-07-29 10:33:54 -07:00
Livar
67910f5e07
Updating branding to 5.0.100-alpha1 2019-07-28 12:06:50 -07:00