Commit graph

380 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
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
John Beisner
b48b7d2ea0 .NET Core 2+ Naming and Versioning
New file name structure for the runtime and the CLI
per: https://github.com/dotnet/designs/issues/2

The renaming of assets, therefore the dotnet installation scripts must change to accommodate.

Trivial:
"Write-Host" should be "Write-Output"
2017-05-26 15:46:56 -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
f82fa91f58 Fix update-dependencies by slimming it way down.
It can no longer be dependent on Cli.Utils, since that will affect which version of NuGet gets used.  It's better for this small console app to just depend on VersionTools.
2017-05-11 10:15:05 -05:00
Eric Erhardt
928c510c84 Clean up unused build code. 2017-05-11 08:59:38 -05:00
Eric Erhardt
f4c4db4d3a update-dependencies hard-coded values
Read MSBuild property values to get GITHUB_UPSTREAM_BRANCH and CORESETUP_VERSION_FRAGMENT instead of hard-coding them in update-dependencies.
2017-04-26 13:28:27 -05:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 12:00:08 -07:00
Eric Erhardt
7b04142ddd Fix update-dependencies
Update all core-setup dependencies.
Fix the app to get its shared framework from stage0 instead of what is currently checked in to the repo (which my mis-match when many builds of core-setup come out at a time).
2017-04-21 13:04:19 -05: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
Livar
e1b4556641 Merge pull request #6254 from mlorbetske/dev/mlorbe/UpdateTemplatesAndEngine
Update template engine & template versions
2017-04-06 18:01:12 -07:00
Mike Lorbetske
379dd5c9e0 Update template engine & template versions 2017-04-05 13:50:12 -07:00
Eric Erhardt
a7becbe6d8 Fix passing /p:DISABLE_CROSSGEN on cli.
When passing a property using the commandline, it is not flown through to "dotnet publish" calls.  So instead of using "dotnet publish", just use the MSBuild task to invoke the Publish target on the reidst project.  This way properties flow correctly.

I also did a little cleaning of unused build logic.
2017-04-04 17:50:28 -05:00
Eric Erhardt
a97b572e49 Use the portable linux-x64 runtime when building on Linux. 2017-03-24 16:19:52 -05:00
Matt Ellis
8b7d1c6e2a Target update-dependencies to netstandard2.0
Previously, this was 1.0 app. Since stage0 no longer contains a 1.0.X
shared framework, it would not run.

Move to 2.0.0 (instead of 1.1.X since the 1.1.X shared framework will
stop being in stage0 soon as well).
2017-03-23 15:04:32 -07: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
Livar
a47cce6150 Merge pull request #5905 from piotrpMSFT/piotrpMSFT/infra/TasklessGitInfo
Remove task usage in commitcount & hash calculation
2017-03-02 21:44:25 -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
d9a06ba95c Remove unnecessary Release constants
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
  </PropertyGroup>
2017-03-02 20:11:21 -08:00
Piotr Puszkiewicz
f39eeaf1c3 Version as Metadata in build_projects/ 2017-03-02 19:50:19 -08:00
Piotr Puszkiewicz
958fc85962 Merge pull request #5870 from ellismg/make-update-dependencies-idempotent
Make update-dependencies idempotent in the only update case
2017-03-02 18:51:31 -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
Matt Ellis
779d26901d Make update-dependencies idempotent in the only update case
Today, if you run update-dependencies --Update and there are no
changes that need to be made (for example, you ran it previously) and
there are pending changes (i.e. git status shows diffs) the program
crashes with an unhandled exception because some code in VersionTools
is upset that there are pending changes since it thinks there should
be none.

Re-structure the code such that we don't call the method that's going
to throw when we are just updating dependencies. This also means
devs (or the composed build) who want to run this more than once do
longer have to reset changes beforehand.
2017-02-28 11:33:37 -08:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00