Commit graph

218 commits

Author SHA1 Message Date
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Livar Cunha
23e39c10b7 Moving as many of our test assets to netcoreapp2.0 as possible. I believe the only ones missing at the test packages, because tools always target 1.0. And the other ones are VSTestDotNetCore and VSTestXUnitDotNetCore, because we can't run tests on 2.0 yet. Or, when I tried it failed. I may came back to try this out later. 2017-03-02 17:41:21 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
2017-03-01 20:50:42 -08:00
Eric Erhardt
a7003763b7 Fix debian_config.json on ubuntu16.10
When we only have a single shared framework, the python json parser throws an error since there is a hanging comma on the last property.

Fixing this by removing the comma when there is only a single Shared Framework dependency.
2017-02-23 23:25:26 -06:00
Eric Erhardt
996d458e30 Support Ubuntu16.10 installer
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
2017-02-22 15:18:45 -06:00
Piotr Puszkiewicz
5ca773e67d Initial commit of 1.0.1 branch 2017-02-21 16:03:28 -08:00
Eric Erhardt
6f666ab7af Update installer monikers.
Also removing a lingering registry key that was originally needed for the rc2 => preview1 SDK re-branding.  This is no longer necessary.
2017-02-06 13:08:44 -06:00
Eric Erhardt
1950ef5e17 Merge rel/1.0.0 into master 2017-01-23 09:57:56 -06:00
Livar
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -08:00
Eric Erhardt
80919ddc12 Work around MSBuild issue with using %AD at the beginning of an Include. 2017-01-05 21:05:06 -06:00
Eric Erhardt
48ec34e7b4 DEB support for installing shared fx 1.1. 2017-01-05 18:06:16 -06:00
Eric Erhardt
6106cae066 PKG support for installing shared fx 1.1. 2017-01-05 17:30:08 -06:00
Eric Erhardt
63669d5129 MSI support for installing shared fx 1.1. 2017-01-05 15:39:35 -06:00
Livar Cunha
63415ec888 Removing an extra 'the' a the welcome message of the pkg installer. 2016-12-05 11:32:04 -08:00
Sridhar Periyasamy
d0e06b9220 Create a nuget package with the windows installers.
These nuget packages are used to deliver the CLI payload to Visual Studio
setup authoring. They are pushed (by VSO build definitions) into an internal feed consumed by
Visual Studio.
2016-10-05 13:56:57 -07:00
Eric Erhardt
cb03b0ef7a Fixing errant file modes from merging 2016-10-03 15:18:20 -05:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05:00
Sridhar Periyasamy
71440a772b Fix the VC Redist links in the installer.
The windows installer downloads the VC redist bundles as a remote payload
from a URL. This URL owned by the VC++ team recently changed to point to
 updated CRTs. This broke our windows installers. So we decided to upload
 the CRTs to a URL owned by the .Net Core team and use that for chaining
 the VC Redist bundle.
2016-09-19 13:19:27 -07:00
Sridhar Periyasamy
8fcfc2af05 Upgrade Corefx and coreclr references
Microsoft.NetCore.App 1.0.0 => 1.0.1
Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4
CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122"

List of changes
- all project.jsons
- dotnet new templates
- and build projects files
   - shared-build-targets-utils\DependencyVersions.cs
   - CliDependencyVersions.cs
2016-08-31 10:41:47 -07:00
Piotr Puszkiewicz
2db1997bc0 Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
2016-08-16 18:30:52 -07:00
Bryan Thornbury
3bc1aa9128 Consume dotnet-deb-tool in cli 2016-07-26 15:26:44 -07:00
Bryan Thornbury
fa97921a4d change to properties, artifact names 2016-06-29 15:12:58 -07:00
Eric Mellino
bc610340f3 Fix eula.rtf formatting 2016-06-14 16:06:16 -07:00
Senthil
469406de7d Fix description of hostfxr 2016-06-14 02:09:25 -07:00
Bryan Thornbury
0f640a32e3 download fxr installer file, use it in pkg targets 2016-06-14 02:09:12 -07:00
schellap
e3c53c18fd Bring Host FXR MSI 2016-06-14 02:08:58 -07:00
Bryan Thornbury
19c905d223 fix reg key in cli msi 2016-06-10 16:37:09 -07:00
Bryan Thornbury
c6718df2fb remove clang-3.5 as a dependency of the deb package 2016-06-01 17:57:15 -07:00
Bryan
aa01110c33 Remove The host build, consume the host build from core-setup 2016-05-25 14:49:12 -07:00
Piotr Puszkiewicz
1033e61d57 preview1 --> preview2
Moves CLI version suffix from preview1 to preview2
Sets channel for preview2 to 1.0.0-preview2, abandoning the Beta channel to the 1.0.0-preview1 release. Once @sokket's publishing cleanup work is complete we can re-converge the channels if desired.
2016-05-09 02:41:11 -07:00
Sridhar Periyasamy
b9c4952e45 Fix the windows installer UI.
Change the font size to accomodate the branding text.
2016-05-06 18:34:45 -07:00
Sridhar Periyasamy
7de8c9b04c Cleanup OSX installer to have same title as windows installer. 2016-05-05 11:06:00 -07:00
PiotrP
fdf70b7a51 Cleaning up ARP entries. 2016-05-05 11:06:00 -07:00
Bryan
d1cd3703ac update rc2-preview1 to preview1 2016-05-05 11:05:58 -07:00
Sridhar Periyasamy
a01fda9856 Fix host version through out the builds.
Refactor HostVersion into its own class and use it everywhere host
artifacts are created. This includes the
- host nuget packages
- host installers (msi, pkg, deb)
2016-05-05 11:05:56 -07:00
Sridhar Periyasamy
e77c92e819 Setup RC2 registry keys for detection.
Fixes - #2833
2016-05-05 11:05:56 -07:00
Piotr Puszkiewicz
34a8a5ad11 Merge pull request #2789 from Sridhar-MS/msi-2713
Change the host MSI dependency key for correct reference counting.
2016-05-03 13:43:20 -07:00
Sridhar Periyasamy
9142ad79bb Setup the registry keys for CLI bundle detection.
Fixes - #2588
2016-05-02 16:31:30 -07:00
Sridhar Periyasamy
2d49e5f25d Merge pull request #2764 from Sridhar-MS/msi-filesinuse
Windows Installer fix for showing correct apps in 'File in Use' dialog.
2016-05-02 13:31:52 -07:00
Sridhar Periyasamy
b35ba10ec3 Change the host MSI dependency key for correct reference counting.
Earlier the host MSI dependency key changed for every version. Therefore
the following stesp uninstalled host aggresively.
- Install a older dotnet CLI bundle (say v1)
- Install a newer dotnet CLI bundle (say v2)
- Uninstall the newer CLI bundle. This removes the host completely and
  leaves the older version v1 unusable.

With this fix all the versions of the CLI in the machine will reference
count the host correctly.

Fixes - #2713
2016-05-02 12:13:26 -07:00
Sridhar Periyasamy
fa90371aff Fix bug to install x64 and x86 SxS.
Remove code to find the previous install folder, always install into
%ProgramW6432%. Also remove the option to allow DOTNETHOME to be
overridable.

Fixes - #2743
2016-04-29 13:16:08 -07:00
Sridhar Periyasamy
b183d7cf50 Windows Installer fix for showing correct apps in 'File in Use' dialog. 2016-04-29 12:01:14 -07:00
Sridhar Periyasamy
779d608ea2 Update debian package branding. 2016-04-28 11:35:31 -07:00
Sridhar Periyasamy
bb56f4f838 Update OSX branding.
And also address PR feedback.
2016-04-27 17:21:43 -07:00
Sridhar Periyasamy
aa512b771c Fix the branding in CLI windows installer
- All the branding is moved to Monikers.cs
- Fixed the bundle and msi to use that.

TODO: Do the same for OSx and Debian installers.
2016-04-27 17:21:43 -07:00
Eric Mellino
50ff706d95 Create breadcrumb store folder in the sharedframework MSI installer 2016-04-22 16:42:13 -07:00
Sridhar Periyasamy
47816da80d Remove any 'beta' string from the MSI installers.
Fixes #2463
2016-04-15 12:11:10 -07:00
Sridhar Periyasamy
5ea0d2c665 Remove check for previous versions of CLI SDK.
In the MSI we used to check for any previous installation and we prevent any
installation of 'Release' version on top of 'Nightly' version and vice
versa. This is no longer needed since CLI SxS now. This is reminiscent of
pre-sharedFx CLI.

Fixes - #2467
2016-04-14 11:47:51 -07:00