Commit graph

378 commits

Author SHA1 Message Date
Nick Guerrera
252218c3d0 Merge 'release/2.0.0' into merges/release/2.0.0-to-master-20170901-070026
Conflicts:
	README.md
	build/Branding.props
	build/DependencyVersions.props
	netci.groovy
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/dotnet-new.Tests/GivenThatIWantANewApp.cs
2017-09-01 11:55:26 -07:00
William Li
cd963e7bdb Remove out of support ubuntu1610 2017-08-31 16:59:17 -07:00
William Li
7f54ccb903 Use Rest Api to upload to the feed
Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script
2017-08-30 06:54:34 -07:00
Daniel Plaisted
fc6f2f3bfa Fix DotNetRestore after merging upstream changes 2017-08-28 12:39:12 -07:00
Daniel Plaisted
107252ebe7 Merge upstream changes 2017-08-28 11:09:19 -07:00
Nick Guerrera
0a1be24e2f Use fixed RTM build of PlatformAbstractions from build project 2017-08-25 20:17:32 -07:00
Daniel Plaisted
12f8c2377f Generate properties to pass to the next stage of the build 2017-08-24 15:51:37 -07:00
Daniel Plaisted
ae0aa8ed24 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly
2017-08-24 15:46:45 -07:00
William Li
1fa454bda4 Ingest new version Aspnet store
Change the url and name accordingly for the name naming convention
2017-08-14 16:05:22 -07:00
Nick Guerrera
a1c423c0f6 Honor UI language override in test runs
Also fix some incorrect unlocalized test expectations that slipped in.
2017-07-18 22:03:31 -07:00
Mike Lorbetske
ea467db3af Update test to pass --no-restore to templates 2017-07-10 16:27:54 -07:00
William Li
bf496a9b12 Update bages to aligan with linux buid definition 2017-06-30 19:33:37 -07:00
Nick Guerrera
cad156947d Merge pull request #7036 from nguerrera/fix-local-tests
Fix test failures in local build due to environment variable filter
2017-06-29 16:47:20 -07:00
Nick Guerrera
59bbc5783f Fix test failures in local build due to environment variable filter 2017-06-29 13:45:01 -07:00
Mike Lorbetske
d8087d35d4 Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 2017-06-29 10:16:02 -07:00
jbeisner
add33234a5 Merge pull request #6857 from johnbeisner/RuntimeCoherence
Enable creation and consumption of a 'coherent' pointer
2017-06-15 10:22:40 -07:00
Livar
47223c9400 Merge pull request #6861 from livarcocc/update_sdk
Updating the SDK. Mostly, had to change PackageTargetFallback to Asse…
2017-06-14 10:34:17 -07:00
John Beisner
af29c61f01 We stopped producing distribution specific assets for Linux; removing the check for existence before publishing to 'latest'. 2017-06-14 09:02:36 -07:00
Livar Cunha
0a4a0a082c Updating the SDK. Mostly, had to change PackageTargetFallback to AssetTargetFallback. 2017-06-14 00:27:26 -07:00
John Beisner
c497bf498f Write a 'latest.coherent.version' file at blob storage so users have a 'coherent' option to SDK installations. 2017-06-13 16:45:29 -07:00
William Li
3419a87d6f Produce RPM packages
Reference from https://github.com/dotnet/core-setup/tree/master/src/pkg/packaging/rpm

The goal is to have parity with Debian,
but does not publish to the feed

When run the script with rhel, it will
produce rpm file in the package step
and publish rpm to the blob storage
2017-06-13 15:00:35 -07:00
Daniel Plaisted
9cd4e5a956 Add Microsoft.NET.Build.Extensions files to package for VS insertion 2017-06-09 11:18:46 -07:00
Livar Cunha
0b19d6889e Updating the vstest.console to use the same runtime that is shipping with the CLI. 2017-06-08 16:45:29 -07:00
Nick Guerrera
a08ebb95a0 Generate equivalent of resx .Designer.cs in build 2017-06-06 21:47:58 -07:00
Livar Cunha
38fc8875f2 Enabling VB in the CLI.
Fixing the permissions for RunVbc.sh.
2017-05-17 22:16:22 -07:00
Eric Erhardt
928c510c84 Clean up unused build code. 2017-05-11 08:59:38 -05:00
Mike Lorbetske
4dd1be1978 Respond to review feedback 2017-04-21 20:51:52 -07:00
Mike Lorbetske
9ea9cbc8a6 Update templates and engine, pin ASP.NET package versions, add web item templates 2017-04-21 20:51:52 -07:00
Rama Krishnan Raghupathy
bb4298ddc2 Updating SDk to 20170414 2017-04-14 14:55:01 -07:00
Rama Krishnan Raghupathy
2f5673f953 moving dependecymodel and platformabstraction to preview1-001960 2017-04-11 17:00:50 -07:00
Mike Lorbetske
fc77d7e152 Update templates & engine, rename --skip-restore to --no-restore 2017-04-10 20:00:17 -07:00
Mike Lorbetske
379dd5c9e0 Update template engine & template versions 2017-04-05 13:50:12 -07:00
Eric Erhardt
a97b572e49 Use the portable linux-x64 runtime when building on Linux. 2017-03-24 16:19:52 -05:00
Matt Ellis
949fbd59db Remove dotnet-cli-build's dependency on CoreCLR
dotnet-cli-build had a package reference to both CoreCLR and a new
version of Microsoft.NETCore.App in order to pull down
crossgen. Crossgen is now restored by a specific project that only
deals will pulling down crossgen, so we can remove this code.

Fixes #6093
2017-03-21 18:32:07 -07:00
jonsequitur
4effd9354c merge 2017-03-21 11:57:08 -07:00
Livar Cunha
df496d0959 Fixing the extra distros. 2017-03-20 12:41:47 -07:00
Jon Sequeira
ca914334ea revert logger colon change 2017-03-19 13:02:09 -07:00
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07:00
Piotr Puszkiewicz
659744d83d Fix build 2017-03-10 14:00:26 -08:00
Piotr Puszkiewicz
0df2462344 Merge remote-tracking branch 'dotnet/master' into tab-completion 2017-03-10 12:03:01 -08:00
jonsequitur
58bf70a476 merge 2017-03-09 18:36:05 -08:00
Eric Erhardt
43263cc9c3 Add logging for publishing src\redist.csproj 2017-03-09 16:30:29 -06:00
Justin Goshi
132b175395 Add new badge for linux_x64 (#5968) 2017-03-09 07:08:49 -10:00
Justin Goshi
45a1e9e56c Allow host info passed in from the command line to override machine settings (#5904)
* Allow host info passed in from the command line to override machine settings

* Simplify the logic

* Address PR comments to keep a separate HostRid and HostOSName that are static

* Rename to BuildInfo.props

* Address PR comments

* Fix the previous merge

* Fix spacing

* Address PR comments
2017-03-08 09:10:53 -10:00
Daniel Plaisted
abdbc6f274 Restore package with crossgen 2017-03-07 16:01:53 -08:00
Jon Sequeira
3dafe9a6e2 add logging to build 2017-03-06 22:10:37 -08:00
Eric Erhardt
21080fc5be Fix UpdateVersionsRepo to pass file paths instead of a directory 2017-03-06 11:22:28 -06: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
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master'
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
2017-03-02 23:49:01 -08:00
Piotr Puszkiewicz
5048f65703 Merged branch master into piotrpMSFT/infra/CodeCleanup 2017-03-02 21:56:50 -08:00
Piotr Puszkiewicz
d55a8f8188 Add missing copyright headers to all cs files 2017-03-02 21:04:03 -08:00
Piotr Puszkiewicz
841846f32b Standardize on newline between Property|ItemGroup areas 2017-03-02 20:38:56 -08:00
Piotr Puszkiewicz
e617376bc7 Trailing newlines + standardize tabs -> spaces 2017-03-02 20:35:20 -08:00
Piotr Puszkiewicz
f39eeaf1c3 Version as Metadata in build_projects/ 2017-03-02 19:50:19 -08:00
Piotr Puszkiewicz
fbb75e1a47 Remove task usage in commitcount calculation 2017-03-02 18:46:08 -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
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
Livar Cunha
94b79f4466 Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently. 2017-03-01 11:46:53 -08:00
Piotr Puszkiewicz
664f089985 Reduce chmod 2017-02-28 18:16:51 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Piotr Puszkiewicz
8fc6766785 Merge branch 'rel/1.0.1' into Merge100To101 2017-02-23 18:22:02 -08:00
Eric Erhardt
ace9526681 Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'
Conflicts:
	README.md
	build/Microsoft.DotNet.Cli.Monikers.props
	test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
2017-02-23 15:42:35 -06: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
Livar Cunha
7f4f35db65 Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change. 2017-02-23 01:13:58 -08:00
Eric Erhardt
916a19c493 Add support for Fedora 24, OpenSUSE 42.1 and Ubuntu 16.10 2017-02-22 15:13:02 -06:00
Mike Lorbetske
e145ca88e4 Placeholder for template update 2017-02-21 16:28:47 -08:00
Livar Cunha
1c409befbe Updating DependencyModel to 1.0.2 2017-02-17 00:29:17 -08:00
Livar Cunha
3eafd9de02 Updating Microsoft.DotNet.PlatformAbstractions version to 1.1.0. 2017-02-16 22:46:04 -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
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -08:00
Livar Cunha
1d61bf97ed Updated the Shared Framework to 1.1.1 and 1.0.4. 2017-02-10 23:05:16 -08:00
Justin Goshi
483e6bd9c1 Address PR comments 2017-02-10 14:13:44 -08:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Eric Erhardt
454dd10f8d Update dotnet new to use the new 2.0 templates. 2017-02-09 10:18:39 -06:00
Livar Cunha
35fc8c1d0e Step one of introducing a flag to drop the suffix out of our build versions. 2017-02-08 15:26:47 -08:00
Eric Erhardt
56d391caad Fix up the merge so it gets past Prepare and Compile. 2017-02-08 12:26:04 -06:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08:00
Eric Erhardt
a2c1a39d07 Fix projects and tests after merge of rel/1.0.0. 2017-02-01 18:35:52 -06:00
Eric Erhardt
9f0bb778a1 Merge rel/1.0.0 into master. 2017-02-01 14:32:59 -06:00
seancpeters
2d93968a88 New3 integration (#5430)
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.

* new cache initialization

* More lzma changes, and removed a razor ref from templates

* Ephemeral hive flag added to tests that need it

* Updated the template engine version to build against. Minor code cleanup

* Config changes to make template versions separate from template engine versions

* Changed dotnet new versioning to use Product.Version

* Fixing Archiver.csproj

* Fixing dotnet new test.

* Fix LZMA Package Source Condition

* Workaround for newline differences.

* fixed tests with changed template parameters. Added a new3 template non-match test
2017-01-31 17:31:37 -08:00
Eric Erhardt
fd65cb03b6 Update dotnet new to generate a "2.0" project. 2017-01-29 09:46:46 -06:00
Piotr Puszkiewicz
ba69c88c79 Work around build test.sln race condition until fixed (#5490)
* Remove GenerateRuntimeConfigurationFiles from this library

* Disable parallel build of test.sln

* PR feedback
2017-01-27 17:13:04 -08:00
Piotr Puszkiewicz
0ab87924b2 Add DOTNET_RUNTIME_ID to kept environment variables 2017-01-27 01:18:50 -08:00
Piotr Puszkiewicz
c4e928a18d Cleanup 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
d70aeb950b Success! 2017-01-27 00:46:09 -08:00
PiotrP
a473c2bad7 WiP 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
94e74d846a WiP 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7 WiP 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
19ed5a558b WiP 2017-01-27 00:46:09 -08:00
Eric Erhardt
0073fc8534 Update CLI to run on netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Eric Erhardt
f6b0196b0f Turn off multi-proc building of the test .sln to work around "cannot access file becuase it is being used by another process" errors. 2017-01-26 07:29:00 -06:00
PiotrP
9008aaff85 merge RC3 into rel/1.0.0 2017-01-11 13:03:09 -08:00
Eric Erhardt
82317c7a0a Merge pull request #5257 from eerhardt/UpdateNuGet
Update NuGet to 4.0.0-rc3-2193 to bring in new TFMs for netstandard/netcoreapp 2.0
2017-01-11 10:45:45 -06:00
Eric Erhardt
c481ad9cdc Merge all hard-coded versions and version suffixes to be defined in a single spot. 2017-01-10 20:54:11 -06:00
Livar Cunha
d3157de6ee Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 16:48:28 -06:00
Livar Cunha
e71c58c156 Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 10:43:05 -08:00
Eric Erhardt
0f2c305dc1 Add NuGet version to DependencyVersions.props. 2017-01-10 10:48:37 -06:00
Eric Erhardt
5035320247 Add NuGet version to DependencyVersions.props. 2017-01-10 10:43:14 -06:00
Livar
f2f37729b8 Merge pull request #5235 from eerhardt/PopulateNuGetCache11
Populate nuget cache for shared fx and asp.net 1.1
2017-01-07 11:31:54 -08:00
Rohit Agrawal
5bbfbfeeed update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214)
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5

* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.

* add a nuget dependency so migrated project has packageref and generates an assets file on restore
2017-01-06 16:28:04 -08:00