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

3513 commits

Author SHA1 Message Date
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
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
jbeisner
a489af6341 Updating link; "Core" change to ".NET Core" 2019-08-06 09:12:39 -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 Cunha
a138255f58 Keep the latest channel as release/3.0.1xx. 2019-07-28 12:04:40 -07:00
Livar Cunha
4083b9eda1 Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS. 2019-07-26 10:38:38 -07:00
John Beisner
a3af2c43a5
Merge pull request #3383 from johnbeisner/TemplatesUpdate 
Adding 2.1 and 2.2 Templates MSIs
 2019-07-24 13:49:56 -07:00
Nick Guerrera
d1f57e32ce
Don't include WindowsDesktop targeting pack in x-plat tarball (#3403) 2019-07-24 11:02:42 -07:00
jbeisner
75e5139fe1 Merging master and resolving conflicts. 2019-07-24 16:14:47 +00:00
jbeisner
67c7c446f9 Updates per code review 2019-07-24 16:08:11 +00:00
jbeisner
249af0f120 Updates per code review. 2019-07-24 03:32:47 +00:00
Daniel Plaisted
5a590771e5
Merge pull request #2970 from dsplaisted/remove-legacyframeworkpackages 
Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference
 2019-07-23 18:58:27 -07:00
jbeisner
b95848906a Fixing the 3.0 template conditional; adding a comment. 2019-07-24 00:41:46 +00:00
jbeisner
aacd4f6179 Updating 3.0 template variables. 2019-07-24 00:18:21 +00:00
jbeisner
14ef11f030 Formatting... 2019-07-22 22:31:48 +00:00
jbeisner
f31451cbc0 Minor updates to variable names 2019-07-22 22:26:51 +00:00
jbeisner
f55ddb8a15 Adding 2.1 and 2.2 Templates MSIs, part 3 2019-07-22 17:06:16 +00:00
jbeisner
4de1b875e5 Adding 2.1 and 2.2 Templates MSIs, part 2 2019-07-22 15:55:23 +00:00
jbeisner
49ad1e8dd5 Adding 2.1 and 2.2 Templates MSIs, part 1 2019-07-17 23:18:41 +00:00
John Beisner
a5630932ee
Merge pull request #3201 from johnbeisner/TemplateMSIs 
Generate a MSI for templates and move templates to dotnet/Templates
 2019-07-17 08:28:28 -07:00
Livar Cunha
34a888c02f Fixing the condition for when we do a build without a suffix (final branding). 2019-07-15 17:22:56 -07:00
Livar Cunha
5475a81a55 Switch to lower case t (templates) for the folder name under dotnet. 2019-07-15 10:25:17 -07:00
Livar Cunha
c35bcd49af Adding new templates folder to pkg native installer. 
Moved templates folder under dotnet to Templates (capital T) and added dotnet/Templates to the deb installer.

Adding Templates to the sdk rpm native installer.
 2019-07-14 22:21:30 -07:00
Livar Cunha
3247485b57 Re-enable the generation of the msbuildextensions nupkg. 2019-07-12 15:05:32 -07:00
jbeisner
e2eb862efb Creating a Windows MSI for templates. 2019-07-11 00:43:29 +00:00
Livar
192b7945f0
Update implicit versions for self-contained apps for 2.1 and 2.2 2019-07-09 14:51:56 -07:00
Daniel Plaisted
fec1bb4f16 Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference 2019-07-08 16:00:33 -07:00
dotnet-maestro[bot]
eccec24551
[master] Update dependencies from aspnet/AspNetCore (#2811) 
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190708.2

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview8.19358.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview8.19358.2
- Microsoft.AspNetCore.App.Ref - 3.0.0-preview8.19358.2
- dotnet-watch - 3.0.0-preview8.19358.2
- dotnet-user-secrets - 3.0.0-preview8.19358.2
- dotnet-dev-certs - 3.0.0-preview8.19358.2

* React to SPA template rename
 2019-07-08 18:20:32 +00:00
jbeisner
9ec2da3408 Branding update to "preview8" 2019-07-02 00:13:44 +00:00
dotnet-maestro[bot]
76797cc920
[master] Update dependencies from dotnet/arcade (#2667) 
* Update dependencies from https://github.com/dotnet/arcade build 20190626.44

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19326.44

* Add missing feed

* Use PackageDownload

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

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19327.39

* Use new apphost package and stop downloading extra packages
 2019-06-28 13:15:43 +00:00
Chris Rummel
6962cd30c5 Allow specifying CoreSetupRid. 2019-06-25 12:08:51 -07:00
Chris Rummel
64ba96eac4 Don't copy over packages if there are no packages to copy. 2019-06-25 12:08:26 -07:00
Chris Rummel
194cdca506 Don't reset blob URL if we pass it in. 2019-06-25 12:08:11 -07:00
Dan Seefeldt
453414fc75 Consolidate MSBuild* versions for source-build (#2554) 2019-06-20 15:24:02 -07:00
Livar
5d80f38dba
Merge pull request #2005 from dotnet/darc-master-33a78994-1ff6-4b93-90fb-cbd9502e5547 
[master] Update dependencies from dotnet/arcade
 2019-06-18 16:52:59 -07:00
Parallels
eb29f40037 Fixing the property we use in the DotnetDebTool to get the path to a stage0 dotnet. 2019-06-18 16:38:26 -07:00
John Beisner
945767a2a2
Addressing VS signing errors. (#2500) 2019-06-18 06:49:09 -07:00
Nate McMaster
c3eb847334
Add linux-musl-arm64 to list of supported AspNetCore runtimes (#2441) 2019-06-12 13:42:09 -07:00
John Beisner
4c3683314b
Rename: "VS.Redist.Common.Net.Core.Toolset" -> "VS.Redist.Common.NetCore.Toolset" (#2403) 2019-06-11 13:16:26 -07:00
Daniel Plaisted
5293e96d5a
Merge pull request #2401 from dsplaisted/update-runtime-packs 
Update runtime pack names
 2019-06-10 17:57:09 -07:00
Daniel Plaisted
da3a92ae63 Remove unused apphost metadata from KnownFrameworkReference 2019-06-10 17:29:39 -07:00
John Beisner
1e7815b2dd
Produce Toolset MSI NuPkgs for insertion into VS (#2359) 
* Produce Toolset MSI NuPkgs for insertion into VS; stop producing SDK bundle NuPkgs.
 2019-06-10 16:00:53 -07:00
Daniel Plaisted
8aff01947a Update runtime pack names 2019-06-10 15:32:28 -07:00
Daniel Plaisted
202d9f2daa
Merge pull request #2279 from dsplaisted/add-ui-knownframeworks 
Add KnownFrameworkReference items for WPF and WindowsForms profiles
 2019-06-05 11:40:21 -07:00
Nick Guerrera
92d69e6885
Exclude sdk resolver layout from source build (#2232) 2019-06-04 13:05:25 -07:00
Daniel Plaisted
e5275d990f Add KnownFrameworkReference items for WPF and WindowsForms profiles 2019-06-03 19:01:54 -07:00
William Li
7cbec05bd5 correct branch info on master (#2253) 2019-06-03 17:30:28 -07:00
William Li
b47d352a48 Update branding to preview 7 2019-06-02 19:35:45 -07:00
William Li
f4215da1b7 Merge remote-tracking branch 'origin/release/3.0.1xx' into merges/release/3.0.1xx-to-master 2019-06-02 10:52:22 -07:00
Peter Huene
565e0d9b06
Update Microsoft.WindowsDesktop.App to mark as "Windows only". 
This commit marks the `Microsoft.WindowsDesktop.App` known framework reference
as Windows only.  This will be used by a upcoming SDK change to ensure that
"Windows only" frameworks can only be used on Windows.
 2019-05-30 17:35:20 -07:00
Nate McMaster
a0107cdb1d
Remove workaround for aspnet/AspNetCore#8835 (#2170) 
* Remove workaround for aspnet/AspNetCore#8835

* Update GenerateLayout.targets

* Update ASP.NET Core to 3.0.0-preview6-19279-08
 2019-05-30 10:48:46 -07:00
Peter Huene
33815f75c9
Remove Windows Desktop project templates for non-Windows. 
This commit removes the Windows Desktop project templates for non-Windows
builds of the .NET Core SDK.

Fixes dotnet/cli#11425.
 2019-05-29 19:06:11 -07:00
John Beisner
6392d02bf3
Updating some translations... (#2194) 2019-05-29 11:56:22 -07:00
John Beisner
808359df16
Increasing the SDK bundle installer button size 20-px (#2123) 
* Increasing the SDK bundle installer button size 20-px
 2019-05-24 15:24:24 -07:00
John Beisner
f55dd40436
Omit nupkgs and related files in the SDK bundle. (#2030) 2019-05-16 16:33:49 -07:00
John Beisner
d987a525c8
Resolve named CAB collision and drop the CABs (#1976) 
* Resolve named CAB collision; drop the CABs.

* Resolving naming convention warning: 8 chars plus {0} are allowed.

* Update src/redist/targets/packaging/windows/clisdk/dotnet.wxs

Co-Authored-By: Peter Huene <pehuene@microsoft.com>
 2019-05-16 16:33:29 -07:00
John Beisner
8ae3afa572
Updating projectUrl values from "cli" to "core-sdk" (#1800) 2019-05-16 16:32:26 -07:00
Nate McMaster
d30a9f5c83
Remove dotnet-sql-cache from the CLI (#2014) 2019-05-16 07:49:25 -07:00
Daniel Plaisted
865f1c2745
Merge pull request #1992 from sbomer/isTrimmable 
Mark Microsoft.NETCore.App as trimmable
 2019-05-15 16:31:10 -07:00
Sven Boemer
39212e1699 Define NetCoreRoot (#1997) 
This will be used by the SDK to locate the dotnet host when running in
desktop msbuild. Necessary for tools that always run on .NET Core,
like the IL Linker.
 2019-05-15 14:24:56 -07:00
John Beisner
b0f2205264
Adding localization to the Windows SDK bundle installers (#1996) 
* Adding localization to the Windows SDK bundle installers
 2019-05-15 12:51:44 -07:00
Livar Cunha
6e33b6e3de Fix implicit versions for self-contained apps. Updated versions to 1.0.16, 1.1.13, 2.1.11 and 2.2.5. 2019-05-14 11:23:04 -07:00
Sven Boemer
8c81543eb5 Mark Microsoft.NETCore.App as trimmable 
The SDK will be updated to flow this metadata to resolved dlls,
influencing the default linker behavior.
 2019-05-14 08:45:50 -07:00
Daniel Plaisted
75702b2d6e
Merge pull request #1839 from dagood/fix-core-setup-download 
Fix core-setup update: download consolidated dotnet-runtime-deps Deb pkg
 2019-05-03 16:03:57 -07:00
Davis Goodin
3985d797c8 Download consolidated dotnet-runtime-deps Deb pkg 2019-05-03 17:18:14 -05:00
Ricardo Arenas
1c52fe86a7 make publish of internal asset conditional (#1832) 2019-05-02 10:50:02 -07:00
Daniel Plaisted
8bcd7ee623 Add PackagesToReference metadata to KnownFrameworkReference 
The SDK will consume this to generate PackageReferences to "empty" packages such as Microsoft.NETCore.App
 2019-04-26 08:47:25 -07:00
Daniel Plaisted
44f0335886
Merge pull request #1765 from dsplaisted/remove-runtimepack-internal 
Don't use .Internal suffix for runtime packs
 2019-04-26 08:30:45 -07:00
Daniel Plaisted
de6f99b7ad Don't use .Internal suffix for runtime packs 
This was removed with https://github.com/dotnet/core-setup/pull/6096
 2019-04-26 08:14:05 -07:00
John Beisner
fe905c81da
SDK bundle UI modifications (#1756) 
* SDK bundle UI modifications.
 2019-04-26 08:06:14 -07:00
Daniel Plaisted
f21fc9c2ba
Merge pull request #1748 from dsplaisted/use-internal-netcoreapp-package 
Switch to  .Internal insertion package for .NET Core
 2019-04-25 11:18:30 -07:00
Daniel Plaisted
27be26f712 Switch to .Internal insertion package for .NET Core 2019-04-25 08:51:39 -07:00
John Beisner
ca9216c97d
[WIP] Removal of additional package feeds set by default (#1561) 
Removal of additional package feeds set by default
 2019-04-23 10:33:16 -07:00
William Li
12b159311d Update branding to preview 6 2019-04-21 18:15:11 -07:00
William Li
d734147745 Revert src/CopyToLatest/targets/BranchInfo.props change 2019-04-21 17:40:05 -07:00
Daniel Plaisted
3289119b23 Update apphost pack pattern 2019-04-19 10:54:35 -07:00
John Beisner
07b074acf7
adding .Net core AppHost pack (#1519) 
* adding .Net core AppHost pack
 2019-04-17 12:53:05 -07:00
Daniel Plaisted
9f998eabcd Switch to .Ref targeting pack for .NET Standard 2.1 2019-04-15 19:04:36 -07:00
dotnet-maestro[bot]
16daae1035
[master] Update dependencies from dotnet/core-setup (#1447) 
* Update dependencies from https://github.com/dotnet/core-setup build 20190412.04

- Microsoft.NETCore.App - 3.0.0-preview5-27612-04
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-04
- NETStandard.Library.Ref - 2.1.0-preview5-27612-04

* Update dependencies from https://github.com/dotnet/core-setup build 20190412.06

- Microsoft.NETCore.App - 3.0.0-preview5-27612-06
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-06
- NETStandard.Library.Ref - 2.1.0-preview5-27612-06

* Updating 'windowsdesktop-runtime' asset names and blob paths.

* Updating the blob root...

* Updating the RID for 'windowsdesktop-runtime' archive.
 2019-04-12 20:15:30 +00:00
John Beisner
0d4bdcd199
adding .Net standard 2.1 Targeting Packs (#1309) 
* adding .Net standard 2.1 Targeting Packs
 2019-04-10 08:55:46 -07:00
Nick Guerrera
28e5c54dfe Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-04-09 11:13:55 -07:00