Commit graph

257 commits

Author SHA1 Message Date
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
Dan Quirk
b3495e3322 Use sh instead of bash 2016-04-05 18:03:06 -07:00
Dan Quirk
561f856e36 Add postinstall script to debian package for telemetry notification 2016-04-05 18:03:06 -07:00
Eric Erhardt
49fae29b7b Merge pull request #2149 from danquirk/EULAUpdate3
EULA update for telemetry/data collection
2016-04-05 19:38:35 -05:00
Bryan Thornbury
fa01c9a154 Merge pull request #2215 from dotnet/brthor/version-manpages
Enable SxS Installation of the SDK debian packages
2016-04-05 15:41:11 -07:00
Matt Ellis
f757468dde Merge pull request #1939 from ellismg/chain-vc-redist
Chain in VC Redist
2016-04-05 10:03:06 -07:00
Matt Ellis
ea317f9386 Chain in VC++ Redist to Bundle 2016-04-04 15:31:25 -07:00
Bryan Thornbury
7de3b95bbd version the manpages before packing them for the sdk deb package
update

Update

fix
2016-04-01 15:42:01 -07:00
Sridhar Periyasamy
389c405ed0 Merge pull request #2163 from Sridhar-MS/installer-fixes
Fix installer issues
2016-04-01 13:41:36 -07:00
Bryan
0fd81e0a2d Extract dotnet-compile-fsc into a standalone command
Add basic Tests for dotnet-compile-fsc

Package Targets execute before TestTargets. Use Generated Nuget Packages in TestTargets. Generate Nuget packages on all platforms, and in C#

Fix bug in dotnet-restore, change fsharp new template, add support for native assets in DependencyContextCsvReader

copy fsc.exe to temp directory instead of package cache

fix rebase error

fix issue

fixes

fixes

fix

temporarily disable debian package e2e testing

fixes

bump fsc version

update fsc version

fix rebase errors

WIP update fsc tool

WIP, rebased and working again, need to solve issues with System.CommandLine

Working state for packaged, command, fsc.exe bugging out with dlopen(, 1): no suitable image found.

execute fsc like a unpublished standalone app

fixup after rebase

working? internet is out

working

cleanup

More cleanup, and run the debian package tests during the Test phase of the build.

update FSharp Test Projects NetStandard Library Version

Update Version Suffix when packing TestPackages. This will enable packing with the right dependency versions on Windows.

update dotnet-test version

Undo the reordering of the build

fix test package project pathsj

ignore net451 build failures for test packages which we need to build on non-windows

update dependency of desktop test app

add dotnetcli feed to nuget config for fsharp dotnet new

update deps after rebase

update dependency of dotnet-compile-fsc

pass args before commandPath when using muxer for tools

adjust testpackage cleaning not to clean packages which are also generated as part of the product from the nuget cache.

undo

Pass projectJson to pack instead of using WorkingDirectory

fix path separators using depsjsoncommandresolver on windows, fix building only specific frameworks for testpackages on non-windows.

PR Feedback

rebase

overwrite fsc runtimeconfig
2016-03-31 14:01:08 -07:00
Dan Quirk
aa12007b61 Update non-ENU EULAs to ENU copies with newest text until LOC is available 2016-03-31 10:46:29 -07:00
Sridhar Periyasamy
988fe85c19 Fix installer issues
- Sign the Sharedfx bundle correctly.
- Fix the installer title for SharedFx bundle. Fixes #2100
- Fix the installer title for SharedFx pkg. Fixes #2161
2016-03-31 10:02:12 -07:00
Dan Quirk
dd15e7ecc6 Updating EULA and README for data collection policy 2016-03-30 16:47:49 -07:00
Sridhar Periyasamy
d9942e7fda Update postinstall
Fixing a typo.
2016-03-28 12:36:34 -07:00
Sridhar Periyasamy
4e5fb96a50 Merge pull request #2048 from Sridhar-MS/msi-changes
Windows Installer changes
2016-03-27 20:49:46 -07:00
Sridhar Periyasamy
4186aca998 Make the bundle to be uninstallable and fix MSI tests. 2016-03-25 16:38:35 -07:00
Sridhar Periyasamy
b3cbd9e766 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into host-pkg-path 2016-03-25 14:59:32 -07:00
Sridhar Periyasamy
4e68c19323 Fix OSx Pkg installers
- Make the .Net CLI SDK install SxS.
- Make the .Net Host upgrade till RTM(v.1.0.0).
- Make the .Net Core Sharedfx pkg to use the SharedFx Nuget version instead CLI version.
2016-03-25 14:46:04 -07:00
Piotr Puszkiewicz
c798a8ff97 Merge pull request #1891 from dotnet/piotrpMSFT/InstallerBranding
Fix installer branding dotnet --> .NET
2016-03-25 14:45:41 -07:00
Piotr Puszkiewicz
af2cac0d88 Fix windows installer paths. 2016-03-25 12:50:37 -07:00
Piotr Puszkiewicz
fcbb7f31a7 Fix Debian branding. 2016-03-25 12:09:45 -07:00
Piotr Puszkiewicz
1efdd24ce7 Further OS X branding changes 2016-03-25 12:09:45 -07:00
Piotr Puszkiewicz
d390790594 Fix installer branding dotnet --> .NET 2016-03-25 12:09:45 -07:00
Sridhar Periyasamy
e81166afce Add to $PATH in the .Net Core Host pkg
Earlier it was incorrectly done in .Net CLI pkg
2016-03-25 11:31:30 -07:00
Sridhar Periyasamy
ccef10b70c Windows Installer changes
- Make CLI SDK MSI non-upgradable. It must alwasy be installed SxS.
- The CLI bundle and SharedFx bundle are non-upgradeable.They are also
  installed SxS.
- Make host\muxer upgradeable. It will be upgradeable till v1.0.0 RTM.
  Post RTM will be installed SxS with v.1.0.0.
- SharedFx MSI was using the CLI MSI version. Fixing it to use the
  SharedFx version.
- Do not allow bundles to uninstall. User will be able to uninstall the
  individual MSIs.
2016-03-24 18:39:28 -07:00
Bryan Thornbury
f596b8ddce Refactor PublishTargets.cs, add publishing of all installers and archives to azure, change all versions to nuget versions. 2016-03-23 17:24:48 -07:00
Bryan Thornbury
96664f31c2 Add publishing for sdk, sharedhost, sharedfx deb files
small fix

disable dotnet-nightly train avoidance, alawys use the same debian config for now
2016-03-22 15:01:06 -07:00
Bryan Thornbury
1c38b17f8b make sdk package sdk only
fix dependencies between packages

re-disable upgrade test

another fi to add_dir_to_install

fix sdk package name

update the package name functino in monikers
2016-03-22 15:01:04 -07:00
Bryan Thornbury
08091d72bc fix version override, remove dependencies of host package 2016-03-22 15:01:03 -07:00
Bryan Thornbury
6ed82a1a3f put all deb packages in the same root, small fix to package tool, renable upgrade tests 2016-03-22 15:01:03 -07:00
Piotr Puszkiewicz
e1ba3f23ef Reference Shared Framework from Shared Host 2016-03-22 15:01:03 -07:00
Piotr Puszkiewicz
63585087f8 Install SharedHost before building shared framework 2016-03-22 15:01:03 -07:00
Bryan Thornbury
97a01213ac Fix debian packages 2016-03-22 15:01:01 -07:00
Sridhar Periyasamy
6c446c033a Address PR feedback.
Change 'Dotnet' to '.Net' in the bundles.
2016-03-22 09:59:47 -07:00
Sridhar Periyasamy
aeaced5b63 Chain the sharedfx and sharedhost MSIs into a single dotnet redist bundle. 2016-03-21 21:00:46 -07:00
Sridhar Periyasamy
ae83a73e35 Create 'dotnet-dev' and 'dotnet' pkg.
- 'dotnet-dev' contains the sharedfx, shared host and CLI SDK.
- 'dotnet' contains the sharedfx and the shared host.
2016-03-17 13:42:10 -07:00
Eric Mellino
9fb3b8788e Add hostfxr.dll to windows host msi 2016-03-15 12:12:28 -07:00
Sridhar Periyasamy
dea1e3242d Create dotnet bundle with CLI SDK, SharedFx MSI and Shared Host MSI. 2016-03-15 11:18:11 -07:00
Eric Mellino
9f3feda606 Add sharedframework and sharedhost debian installer tests
These are basic tests for now, which validate installation, upgrade,
uninstall, etc. of the debian package itself. When the shared framework is
fully functional, we will add more tests that cover real functionality.
2016-03-11 15:10:33 -08:00
Eric Mellino
d77fad4e68 Bring the OSX installer 'title' in line with Windows
It now includes the shared framework 'name' (NuGet package name) in the installer. In this case, the installer is called '.NET Core Shared Framework (NETStandard.Library 1.0.0-*)'
2016-03-10 15:19:54 -08:00
Eric Mellino
edbbc64b03 Fill out pkg installer targets
This causes three pkg files to be produced:

* A component pkg for the shared framework.
* A component pkg for the shared host.
* A product archive which includes the above two components.

The product archive also needs a distribution.xml file which contains
metadata about the package (name, title, images, etc.).

The installer for the "SDK" itself is still using logic implemented in
package-osx.sh. We should move this logic into the build target as well,
but we may want to wait until the CLI is using the shared framework to do so.
2016-03-10 10:31:45 -08:00
Matt Ellis
56e5a99c54 Add Shared Host Debian Package 2016-03-10 03:42:45 -08:00
Matt Ellis
696f4dc167 Add Shared Framework debian packaging 2016-03-10 03:42:45 -08:00
Matt Ellis
e6bcfee4a4 Add SharedFramework MSI Authoring 2016-03-10 03:37:41 -08:00
Matt Ellis
04d21e6693 Add Shared Host MSI Authoring
Ideally in the project.json for the shared host we would just list the
actual package that holds the shared host, instead of all of
NetStandard.Library, but doing some leads to compliation errors, since
publish wants to include a compile step that has a generated
AssemblyAttributes file which references types like System.String.
2016-03-10 03:37:41 -08:00
Sridhar Periyasamy
1737fa8cbc Fix debian package tests 2016-03-09 18:55:26 +00:00
Sridhar Periyasamy
b99e40bfab Address PR feedback and remove Azure CLI from dockerfiles
We no longer need Azure CLI since publish is now via C#.
2016-03-08 18:46:54 -08:00
Sridhar Periyasamy
ae041c8f61 Address some PR feedback.
- Make the MSI scripts to use parameters instead of environment variables.
2016-03-08 23:31:14 +00:00
Sridhar Periyasamy
d4a3190bfc Refactor the build scripts
- Bifurcate Package and Publish targets to enable signing.
- Move publish from bash/ps into c#.
- Create multiple targets to create MSIs and Bundles.
2016-03-07 12:20:50 -08:00
Sridhar Periyasamy
de89da6a3a Merge pull request #1551 from Sridhar-MS/cli-x86-support
Add support for building Windows x86 version of dotnet CLI
2016-02-29 14:59:51 -08:00
Zlatko Knezevic
9d742e41ac Merge pull request #1538 from blackdwarf/buildscriptfix
Fixing the name of the OS X package
2016-02-29 11:23:50 -08:00
Zlatko Knezevic
18b0273850 Responding to PR feedback 2016-02-29 06:57:47 -08:00
Sridhar Periyasamy
01d2656be1 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into cli-x86-support 2016-02-26 14:34:25 -08:00
Bryan Thornbury
ea4f15bb5a delete left over file 2016-02-24 14:30:13 -08:00
Sridhar Periyasamy
834edfbc9c Add support for building Windows x86 version of dotnet CLI
- Changes to build scripts to produce Winx86 build artifacts like
  zip/installer.
- Change to run Nuget-xplat in the same process as dotnet.exe instead of
  spinning up a new 'corerun' process.
2016-02-23 18:04:49 -08:00
Zlatko Knezevic
5ea34f66ec Fixing the name of the OS X package
There was a bug in naming the versioned PKG for OSX when it is being packaged. This resulted
in two different names for the latest and versioned, which is not what we want.

Fix #1537
2016-02-23 11:31:10 -08:00
Sridhar Periyasamy
e9d2a37427 Download Wix tools v3.10.2
Security vulnerability with earlier Wix versions -
https://www.firegiant.com/blog/2016/1/20/wix-v3.10.2-released/
2016-02-22 15:24:34 -08:00
Sridhar Periyasamy
8179958342 Upgrade Wix to stable version 3.10.1.
Get rid of dummy project and instead download Wix tools directly.
2016-02-22 11:57:43 -08:00
Piotr Puszkiewicz
e625cbcf7a Removes usage of DOTNET_HOME in CLI repo.
DOTNET_HOME is no longer required, though it is a documented override, so this change removes all unnecessary references to DOTNET_HOME from the CLI Repo.
2016-02-18 15:38:23 -08:00
Eric Erhardt
5b84d9df00 Merge pull request #1317 from eerhardt/MovePackageTool
Move the debian package_tool into our \tools directory.
2016-02-17 16:21:48 -06:00
Eric Erhardt
7b09f3fcac Move the debian package_tool into our \tools directory.
The package_tool isn't really part of our product, so moving it to the tools directory.
2016-02-17 15:50:37 -06:00
Bryan Thornbury
73050f535f Clean up symlinks and fix conflict with mono-runtime-common
remove dotnet_home workaround in debian package
2016-02-17 19:56:22 +00:00