Commit graph

129 commits

Author SHA1 Message Date
Daniel Plaisted
9cd4e5a956 Add Microsoft.NET.Build.Extensions files to package for VS insertion 2017-06-09 11:18:46 -07:00
William Li
987d4c0b05 Make deb package has linux-x64 content
By build using RID -- linux-x64 and
package publish use HostRID ubuntu etc
2017-06-07 19:55:11 -07:00
John Beisner
eb3beef346 Updates to DEB packaging and publishing. 2017-06-06 15:26:04 -07:00
John Beisner
b0648b1809 Stop producing the 'dotnet-runtime-sdk' packages.
https://github.com/dotnet/cli/issues/6718
2017-06-05 11:50:56 -07:00
John Beisner
78a0b7560d Renaming "dotnet-dev" to "dotnet-sdk" for DEB targets. 2017-06-05 10:48:12 -07:00
Eric Erhardt
7079f047f6 Revert "Temporarily change the runtime deb pkg name to unblock the integration."
This reverts commit f709590402.
2017-06-02 11:05:57 -05:00
Eric Erhardt
f709590402 Temporarily change the runtime deb pkg name to unblock the integration. 2017-06-01 11:35:23 -05:00
Eric Erhardt
4de4ee225b Fix dotnet-deb-tool path. 2017-05-31 17:10:12 -05:00
Eric Erhardt
61c217c6f2 Fix shared framework deb package name in response to https://github.com/dotnet/core-setup/pull/2461 2017-05-24 19:36:39 -05:00
William Lee
4701bcb768 Produce Debian 8 native package (#6604)
* Produce Debian 8 native package

Since Debian is a branch from Ubuntu threat them the same

Tested on Debian 8 VM

* fix file path

* Fix name field in Publish Deb packages

* publish debian 8 native to Azure
2017-05-18 21:33:47 -07:00
Eric Erhardt
928c510c84 Clean up unused build code. 2017-05-11 08:59:38 -05:00
Livar Cunha
9c796bbe6b Refactoring shared item groups between deb and pkg to the same location. 2017-05-03 17:55:34 -07:00
Livar Cunha
1736c388b0 Adding the Asp.Net runtime package store to the SDK pkg for now, since we don't have a separate PKG for it being produced. 2017-05-03 17:38:06 -07:00
William Li
3e42e8233b Add asp.net runtime to SDK deb package
Copy the runtime file to the deb layout folder, the deb tool picks it up
from there
2017-05-03 23:42:06 +00:00
William Li
c9295d1df7 Run dotnet new after install to prime cache for deb
Copy postinst to correct directory

Can only rely on env for get dotnet command

Print telemetry notice anyway
2017-05-03 14:10:30 -07:00
John Beisner
6ada5b7596 Inserting 'AspNetCorePackageStoreLib.wixlib' into the 'dotnet-dev-win' bundles. 2017-05-01 21:42:51 -07:00
John Beisner
a4aa850f6b Merge remote-tracking branch 'upstream/release/2.0.0' into NewAzurePackageStore 2017-04-28 16:23:02 -07:00
John Beisner
de46bf31d8 Add ASP .Net Core Runtime to the CombinedFrameworkSdk archive. 2017-04-28 12:25:46 -07:00
Nick Guerrera
fa4fe3b2c6 Package MSBuild SDK resolver in VS insertion nupkg 2017-04-27 23:07:19 -07:00
Livar Cunha
e286c65d25 Removing Additional Framework entirely and renaming LegacyRuntime to something more appropriate: BackwardsCompatibleRuntimes. Also, turning off some tests that I forgot to turn off for linux-x64. 2017-04-08 00:31:27 -07:00
Livar Cunha
772e838ff8 Removing the additional shared framework from the official stage2 build of the CLI. Instead, I also create a stage2 build with the legacy runtime so that we can continue to run tests tthat depend on it, but most importantly, we will be able to run backwards compatibility tests using it. 2017-04-08 00:31:27 -07:00
Eric Erhardt
56f2652406 Fixing the reference to dotnet-deb-tool to be correct.
No more using * versions.  Only specify the version in a single place.
2017-03-30 14:39:54 -05:00
Nick Guerrera
5e26d0f160 Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00
Livar Cunha
ab28591c10 Replacing hard coded references to shared framework version. 2017-03-06 21:25:42 -08:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly.
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
2017-03-03 21:43:38 -06:00
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Livar Cunha
c667ec7702 Fixing a bad merge on Installer.DEB.proj. 2017-03-03 01:08:58 -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
Justin Goshi
9ffa76eab4 Fix broken publish for official builds 2017-02-28 10:16:52 -08:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -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
Justin Goshi
0ec5003d68 Forgot Installer.PKG.targets 2017-02-23 13:59:20 -08:00
Justin Goshi
d9e532a53d Fix the build break 2017-02-23 13:30:04 -08:00
Eric Erhardt
5227896d0f Fix Ubuntu16.10 BuildSdkDeb
We need to replace a string with string.Empty in the debian .json file. Fixing ReplaceFileContents to support this scenario.
2017-02-23 15:29:11 -06:00
Justin Goshi
43cf7be593 Try to fix the build break 2017-02-23 13:11:25 -08:00
Justin Goshi
84e8b8580d Try the rename of the LayoutOutput directory 2017-02-23 12:28:57 -08:00
Justin Goshi
b86afddbd3 Try reverting Installer.DEB.targets to investigate the build break 2017-02-23 12:03:17 -08:00
Justin Goshi
2118c643d6 Refactor props in package directory 2017-02-23 10:37:48 -08:00
Justin Goshi
acc77e2a46 Address pr comments 2017-02-23 09:26:14 -08:00
Eric Erhardt
7036fa1aef Update dotnet-deb-tool-consumer to use the latest dotnet-deb-tool.
The latest deb-tool will use the CLI's runtime, which is required on distros that don't have .NET Core 1.0 installed.
2017-02-22 21:34:22 -06:00
Justin Goshi
e894d7e60e Refactor publish.target 2017-02-22 16:54:15 -08: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
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Piotr Puszkiewicz
85b2a129db Merge branch 'rel/1.0.0'
Conflicts:
	TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
	TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
	TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
	build.proj
	build/Compile.targets
	build/Microsoft.DotNet.Cli.Compile.targets
	build/Microsoft.DotNet.Cli.DependencyVersions.props
	build/Microsoft.DotNet.Cli.Monikers.props
	build/Microsoft.DotNet.Cli.Prepare.targets
	build/package/Microsoft.DotNet.Cli.Nupkg.targets
	build/package/Nupkg.targets
	build/test/TestPackageProjects.targets
	build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
	build_projects/dotnet-cli-build/GetCommitCount.cs
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
	src/dotnet-archive/dotnet-archive.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_nuget/tool_nuget.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/ArgumentsReflector/ArgumentsReflector.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/crossgen.Tests/crossgen.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-build.Tests/dotnet-build.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
	test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
	test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-run.Tests/dotnet-run.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
	test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
	test/dotnet-test.Tests/dotnet-test.Tests.csproj
	test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
	test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
	tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Justin Goshi
e7de32e988 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
Matt Ellis
47b75cfa12 Misc build changes
For injestion into a composed build, I'm adding some minor tweaks to
our build system:

 - Teach DownloadFile task how to consume file:// URLs so we can pass
   around artifacts using local sources.
 - Add `SkipBuildingInstallers`, an MSBuild property that can be set
   to true when installers (pkgs, msis, debs, rpms and the like) do
   not need to be built.
 - Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
   can be set to prevent additional shared frameworks (i.e. shared
   frameworks that the CLI does not use at runtime) from being
   downloaded and included in our payload.
 - Add `IncludeNuGetPackageArchive` an MSBuild property that can be
   set to prevent the lzma archive containing all the nupkgs we
   restore on first run from being included in the final output.
 - Provide a way to change the Uri use for blob storage (so the
   composed build and point at a local folder that looks like blob
   storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00