mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
5864 commits 41 branches 190 tags 95 MiB
Commit graph

654 commits

Author SHA1 Message Date
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Daniel Plaisted
4b9c4efc3f Update versions of MSBuild and NuGet 2017-03-03 12:33:56 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Eric Erhardt
7fca740af5 Update NET.Sdk to 1.1.0-alpha-20170303-2 2017-03-03 10:11:30 -06:00
Livar Cunha
c667ec7702 Fixing a bad merge on Installer.DEB.proj. 2017-03-03 01:08:58 -08: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 Cunha
103833fd34 Updating the version of the TestFramework which fixed the tests for dotnet test and vstest and actually managed to move the projects used there to 2.0. So, only test packages should remain 1.0. 2017-03-02 21:43:06 -08:00
Piotr Puszkiewicz
a5862752c9 Version as Metadata in build/ 2017-03-02 19:50:46 -08:00
Piotr Puszkiewicz
fbb75e1a47 Remove task usage in commitcount calculation 2017-03-02 18:46:08 -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
792cc7bf2a Fixing a couple of wrong merges. 2017-03-01 22:34: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
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
eee7c7ed32 Move PDB removal to redist.csproj target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
283a80dff0 Move Symbols package creation to redist target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
28d83da782 Remove vbc in a target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
db35770913 Add back Windows condition 2017-02-28 19:30:43 -08:00
Piotr Puszkiewicz
664f089985 Reduce chmod 2017-02-28 18:16:51 -08:00
Piotr Puszkiewicz
b2429da437 Merge pull request #5869 from dotnet/dev/jgoshi/fixBrokenPublish 
Fix broken publish for official builds
 2017-02-28 14:34:32 -08:00
Piotr Puszkiewicz
52af661ca2 Merge pull request #5866 from piotrpMSFT/piotrpMSFT/infra/crossgentarget 
Simplify crossgen script and move to dedicated target in redist.csproj
 2017-02-28 14:33:58 -08:00
Piotr Puszkiewicz
88ab21600d Remove RID from package creation 2017-02-28 12:00:05 -08:00
Justin Goshi
9ffa76eab4 Fix broken publish for official builds 2017-02-28 10:16:52 -08:00
Piotr Puszkiewicz
01ca1b1208 Ensure redist publishes Roslyn 
Also fix issue found in PR
 2017-02-28 01:39:45 -08:00
Piotr Puszkiewicz
9bdd38cc19 Initial 2017-02-28 01:17:22 -08:00
Eric Erhardt
37c6842e00 Update NET.Sdk to 1.1.0-alpha-20170228-1. 2017-02-27 23:24:02 -08:00
Eric Erhardt
c1da263d40 Update NuGet to 4.0.1-beta-2321. 
Update NET.Sdk to 1.1.0-alpha-20170227-1
 2017-02-27 23:23:37 -08:00
Eric Erhardt
93f8157a04 Update NET.Sdk to 1.1.0-alpha-20170217-4 2017-02-27 23:21:16 -08:00
Piotr Puszkiewicz
15f1582945 Move Test to use build output where possible. 2017-02-27 20:45:26 -08:00
Piotr Puszkiewicz
8ca21b67f9 Add relative paths, add logs by default 2017-02-27 17:19:39 -08:00
Piotr Puszkiewicz
5d193e8b39 Merge conflicts 2017-02-27 17:13:13 -08:00
Piotr Puszkiewicz
b1787426c0 Also move nupkg contentFiles 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Piotr Puszkiewicz
7ea5bf478e Merge pull request #5861 from dotnet/dev/jgoshi/removeDuplicateProps 
Remove duplicate properties
 2017-02-27 16:40:31 -08:00
Piotr Puszkiewicz
e92f9dfe0d Bump to 2.0.0-rc5-61427-04 2017-02-27 15:07:54 -08:00
Piotr Puszkiewicz
79704cc074 Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn 2017-02-27 13:15:06 -08:00
Eric Erhardt
c66d3bb6ad Update NuGet version with latest netstandard2.0 build 2017-02-27 14:50:39 -06:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
0a6deabcce Enable multi-proc build of test sln. 2017-02-27 10:34:59 -08:00
Piotr Puszkiewicz
b55b5ad033 Remove duplicate installer suffix 2017-02-27 10:21:42 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Eric Erhardt
23392fa3c3 Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn 2017-02-25 13:12:35 -06:00
Livar Cunha
9210b84a98 Updating the SDK to 1.0.0-alpha-20170224-6 2017-02-24 15:56:59 -08:00
Livar Cunha
b3da712d3d Updating both platform abstractions and dependency model to 1.0.3. 2017-02-24 14:52:05 -08:00
Unknown
66be1db3fe Bump Roslyn to 2.0.0-rc5-61424-02 2017-02-24 14:11:35 -08:00
Justin Goshi
1b318510b2 Add back last empty line in BranchInfo.props 2017-02-24 10:36:07 -08:00
Justin Goshi
8279c16fa4 Merge branch 'master' into dev/jgoshi/removeGlobalProps 2017-02-24 10:34:23 -08:00
Justin Goshi
5bb7ca8112 Add back BranchInfo.props 2017-02-24 10:34:16 -08:00
Piotr Puszkiewicz
e2dcac0e4b Merge branch 'rel/1.0.1' into FixUbuntu1610 2017-02-24 01:22:49 -08:00
Unknown
3dc266f21c Remove RID from test package creation 2017-02-24 00:57:15 -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
Livar
16d1fe4c28 Merge branch 'rel/1.0.0' into update_sdk 2017-02-23 19:49:36 -08:00
Piotr Puszkiewicz
781326a0ad Merge branch 'rel/1.0.0' into tp-insert-15.0.0 2017-02-23 18:40:58 -08:00
Piotr Puszkiewicz
8fc6766785 Merge branch 'rel/1.0.1' into Merge100To101 2017-02-23 18:22:02 -08:00
Piotr Puszkiewicz
22fcc35797 Merge pull request #5820 from dotnet/dev/jgoshi/refactorPackage 
Refactor props in package directory
 2017-02-23 18:15:52 -08:00
Justin Goshi
74e343e111 First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
Mike Lorbetske
d9d5bb10cb Template update for test SDK version change 2017-02-23 14:13:27 -08:00
Matt Ellis
0f092f92c2 Don't look for Debian package dependencies when skipping installers 
Today, we always check to see if DebianPackageBuildDependencies are
present on the machine doing a build, because we will need them to
build the .deb files later on.

Since we now allow skipping of building packages, don't check for
these dependencies if we weren't going to use them.
 2017-02-23 14:11:11 -08:00
Justin Goshi
0ec5003d68 Forgot Installer.PKG.targets 2017-02-23 13:59:20 -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
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
Piotr Puszkiewicz
55b81e8a23 Merge pull request #5814 from piotrpMSFT/piotrpmsft/infra/removeCoreHost 
Remove corehost from CLI layout
 2017-02-23 12:40:21 -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
Satya Madala
4c44e29ea0 TestPlatform branding changes: 15.0.0 2017-02-24 00:18:10 +05:30
Justin Goshi
2118c643d6 Refactor props in package directory 2017-02-23 10:37:48 -08:00
Piotr Puszkiewicz
9e4beca874 Merge pull request #5804 from dotnet/dev/jgoshi/refactorPublishTarget 
Refactor publish.target
 2017-02-23 10:13:47 -08:00
Justin Goshi
acc77e2a46 Address pr comments 2017-02-23 09:26:14 -08:00
Justin Goshi
08ffc78be6 Merge branch 'master' into dev/jgoshi/refactorPublishTarget 2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
56f9a84dfd Generate Version file before redist publish 2017-02-23 02:33:00 -08:00
Piotr Puszkiewicz
49dd6bcd7c Remove corehost from CLI layout 2017-02-23 01:36:43 -08: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
Piotr Puszkiewicz
7818348fc2 Move copying sharedfx to before publish of redist 2017-02-23 01:12:32 -08:00
Piotr Puszkiewicz
1199df1c05 Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Piotr Puszkiewicz
dc1b97c4a1 Merge pull request #5806 from piotrpMSFT/piotrpMSFT/infra/HackFilesToCopy 
remove HackFilesToCopy
 2017-02-22 20:16:51 -08:00
Piotr Puszkiewicz
10750eb136 Merge pull request #5807 from piotrpMSFT/piotrpMSFT/infra/RoslynStaticPublish 
Enable Publishing Roslyn with Static Output Path
 2017-02-22 20:16:25 -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
Piotr Puszkiewicz
b9378b8a66 Merge pull request #5803 from dotnet/dev/jgoshi/refactorPublishDir 
Refactor props from publish directory
 2017-02-22 17:49:08 -08:00
Piotr Puszkiewicz
31f2410b4f Enable Publishing Roslyn with Static Output Path 2017-02-22 17:33:26 -08:00
Piotr Puszkiewicz
4d0dbdbb7f Cleanup 2017-02-22 17:05:49 -08:00
Piotr Puszkiewicz
1ed6c2cdac Fix spacing 2017-02-22 17:01:14 -08:00
Piotr Puszkiewicz
5a89b01459 Remove HackFilesToCopy 2017-02-22 16:57:32 -08:00
Piotr Puszkiewicz
84ead82037 RootProject property 2017-02-22 16:57:10 -08:00
Justin Goshi
8b2933839c Merge 2017-02-22 16:56:34 -08:00
Justin Goshi
e894d7e60e Refactor publish.target 2017-02-22 16:54:15 -08:00
Piotr Puszkiewicz
509cd0addb Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:47:08 -08:00
Piotr Puszkiewicz
4105138019 Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:33:51 -08:00
Justin Goshi
1f39e07909 Refactor props from publish directory 2017-02-22 16:19:56 -08:00
Unknown
1c9f2e9b83 ProjectsToPublish 2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121 RootProject property 2017-02-22 15:31:55 -08:00
Piotr Puszkiewicz
3c8477ad1b Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100 2017-02-22 15:23:15 -08:00
Mike Lorbetske
6a26c5584a Pick up a newer version of templates carrying the latest test SDK changes 2017-02-22 14:04:17 -08:00
Justin Goshi
13dbdd1a4e Merge 2017-02-22 13:38:39 -08:00
Piotr Puszkiewicz
a0a7512d7b Merge pull request #5782 from dotnet/dev/jgoshi/refactorCrossgenTarget 
Refactor props in crossgen.target
 2017-02-22 13:19:27 -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
Eric Erhardt
916a19c493 Add support for Fedora 24, OpenSUSE 42.1 and Ubuntu 16.10 2017-02-22 15:13:02 -06:00
Justin Goshi
4442b45fef Try to fix spacing part 3 2017-02-22 11:08:16 -08:00
Justin Goshi
c51d129294 Try to fix spacing part 2 2017-02-22 11:06:57 -08:00
Justin Goshi
aff69fb324 Try to fix spacing 2017-02-22 11:03:11 -08:00
Justin Goshi
7b62dd1267 Address some of the PR comments 2017-02-22 10:52:50 -08:00
Justin Goshi
1d9a2e5da1 Merge branch 'master' into dev/jgoshi/refactorLzmaTarget 2017-02-22 10:21:22 -08:00
Justin Goshi
02e47f1d00 Address PR comments 2017-02-22 10:10:54 -08:00
Justin Goshi
70b6dc3be6 Merge branch 'master' into dev/jgoshi/refactorCrossgenTarget 2017-02-22 10:08:54 -08:00
Justin Goshi
d828a08e60 Address PR comments 2017-02-22 09:25:06 -08:00
Justin Goshi
f7d77e3e54 Merge branch 'master' into dev/jgoshi/refactorTestTarget 2017-02-22 09:17:54 -08:00
Piotr Puszkiewicz
c5e7c3dd45 Merge pull request #5736 from dotnet/dev/jgoshi/morePropsRename 
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
 2017-02-22 09:15:20 -08:00
Arun Mahapatra
c4df7e5e2d Update TestPlatform to v15.0.0-preview-20170222-09. 2017-02-22 19:56:57 +05:30
Piotr Puszkiewicz
a1e9a5dfc4 PR feedback 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
70b0a68038 Fix Stage2SdkDirectory 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
a7fdc20f25 Convert redist.csproj outputdir to static property 
Also some cleanup to unnecessary stuff.
 2017-02-21 22:17:28 -08:00
Mike Lorbetske
36717ef3fc Fix lzma archive creation to include 1.0.x packages 2017-02-21 21:04:50 -08:00
Piotr Puszkiewicz
7a84c47d97 Update CLI branding 2017-02-21 16:40:12 -08:00
Mike Lorbetske
e145ca88e4 Placeholder for template update 2017-02-21 16:28:47 -08:00
Piotr Puszkiewicz
5ca773e67d Initial commit of 1.0.1 branch 2017-02-21 16:03:28 -08:00
Justin Goshi
d6dccfe75b Fix build breaks 2017-02-21 15:57:16 -08:00
Justin Goshi
2eb2c00b30 Refactor props in crossgen.target 2017-02-21 14:22:36 -08:00
Justin Goshi
b58a0210e2 Refactor properties from LzmaCompile.targets 2017-02-21 12:52:17 -08:00
Justin Goshi
f8148abec3 merge 2017-02-21 10:16:07 -08:00
Justin Goshi
27a11e4eca Merge branch 'master' into dev/jgoshi/morePropsRename 2017-02-21 10:00:30 -08:00
Livar Cunha
3ff78c64ff Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix. 2017-02-18 22:03:36 -08:00
Livar
aba1e18ff6 Merge branch 'rel/1.0.0' into tp-20170217 2017-02-17 21:34:26 -08:00
Piotr Puszkiewicz
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Justin Goshi
4f209e61ea Refactor properties out of test.targets 2017-02-17 12:28:25 -08:00
Justin Goshi
30a43b3bda Merge 2017-02-17 09:53:00 -08:00
Livar
c779000010 Merge branch 'rel/1.0.0' into update_platform_abstractions 2017-02-17 09:02:54 -08:00
Satya Madala
44100209bc update TestPlatform version to 15.0.0-preview-20170217-05 2017-02-17 19:25:44 +05:30
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
Piotr Puszkiewicz
60b73e62a9 bump SDK to 20170217-2 2017-02-17 00:44:38 -08:00
Livar Cunha
1c409befbe Updating DependencyModel to 1.0.2 2017-02-17 00:29:17 -08:00
Justin Goshi
23a3879f46 Fix build break 2017-02-16 16:42:49 -08:00
Justin Goshi
5359ce47e9 Rename 2017-02-16 15:10:18 -08:00
Justin Goshi
e232e7d386 Revert the new file name 2017-02-16 15:09:42 -08:00
Justin Goshi
8acaadb625 Revert the rename 2017-02-16 15:09:08 -08:00
Justin Goshi
58d167f3e5 Refactor properties out of Compile.targets 2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0 Finish renaming props file to remove Microsoft.Dotnet.Cli prefix 2017-02-16 11:16:20 -08:00
Justin Goshi
c8fb586677 merge 2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
0e5633e527 Remove BundledRuntimes properties 2017-02-15 19:37:51 -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
2664015e55 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 16:01:37 -08:00
Livar
a1f4e81aec Merge branch 'rel/1.0.0' into piotrpMSFT/bump/15.1.548 2017-02-15 13:03:27 -08:00
Steve Desmond
bcad939b91 don't try to make crossgen executable if crossgen is disabled (it might not exist!) 2017-02-15 15:39:55 -05:00
Justin Goshi
4d38a9be97 Fix the file 2017-02-15 12:00:57 -08:00
Justin Goshi
74493a13e9 Delete the renamed file 2017-02-15 11:59:51 -08:00
Justin Goshi
b40635f8df Fix up the file 2017-02-15 11:59:30 -08:00
Justin Goshi
2f298ed616 Now add the original file without any rename 2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30 One more try. Delete the file first 2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0 try new spacing 2017-02-15 11:54:35 -08:00
Livar Cunha
6c07b929bd The variable was missing dollar sign parenthesis in the target file. 2017-02-15 11:53:31 -08:00
Justin Goshi
0c7a94e7cb Trying to figure out spacing 2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d fix tabs 2017-02-15 11:51:00 -08:00
Justin Goshi
688195b8b5 try again 2017-02-15 11:47:33 -08:00
Justin Goshi
e85f4069c4 Now rename 2017-02-15 11:43:27 -08:00
Justin Goshi
7a894df413 Trying to fix the diff of one file 2017-02-15 11:42:34 -08:00
Justin Goshi
72db23ed4d Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 10:28:47 -08:00
Piotr Puszkiewicz
627c03b070 Bump MSBuild to 15.1.548 2017-02-14 22:47:37 -08:00
Piotr Puszkiewicz
25e0020da5 Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 16:51:59 -08:00
Nate Amundson
73d59c423d Remove import of dir.props from Signing.proj 
The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.)  Once the agents have MSBuild 15, this import can be added back.
 2017-02-14 16:49:57 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Piotr Puszkiewicz
a906069859 Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj 
Remove more properties from build.proj
 2017-02-14 16:19:53 -08:00
Piotr Puszkiewicz
6415c2334a Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 15:47:24 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Livar Cunha
8a53b08959 Running chmod after crossgen so that our chmod changes are not overwritten by it. 2017-02-14 13:13:08 -08:00
Justin Goshi
87ee130ab5 Create CoreSetupInfo.props 2017-02-14 10:30:28 -08:00
Rohit Agrawal
9cf8e8c57f update nuget to 4.0.0-rtm-2283 (#5691) 2017-02-13 18:11:51 -08:00
Justin Goshi
3b9ecf7f86 Address PR comments 2017-02-13 17:37:23 -08:00
Rama Krishnan Raghupathy
badab4680d Adding the shim of dotnet-cache 
Adds filter profile option to publish
 2017-02-13 16:01:06 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647) 
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
 2017-02-13 13:06:30 -08:00
Livar
251237b481 Merge branch 'rel/1.0.0' into drop_suffix 2017-02-11 11:52:10 -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
Eric Erhardt
01d2505c03 Merge pull request #5662 from eerhardt/FixNetStandardLibrary 
Fix dotnet new classlib to contain the correct NETStandard.Library version.
 2017-02-10 20:26:11 -06:00
Livar Cunha
167e2da398 Updating msbuild to 15.1.0-preview-000545-01. 2017-02-10 16:13:15 -08:00
Justin Goshi
483e6bd9c1 Address PR comments 2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8 Merge branch 'master' into dev/jgoshi/refactorTasks 2017-02-10 13:38:07 -08:00
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version. 
Fix #5638
 2017-02-10 14:22:07 -06:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Eric Erhardt
e7689a3116 Merge pull request #5648 from eerhardt/master-UpdateDependencies 
Upgrade update-dependencies
 2017-02-10 14:02:12 -06:00
Arun Mahapatra
4621c1a6ec Insert TestPlatform v15.0.0-preview-20170210-02. 2017-02-10 21:58:34 +05:30
Livar
1c896d4402 Adding release suffix as a modified parameter of the build and removing NugetVersionForVS. we don't need that concept. 2017-02-09 22:31:46 -08:00
Livar Cunha
81a94c0902 Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI. 2017-02-09 15:47:53 -08:00
eerhardt
72af77de1b Update CoreSetup to beta-001509 2017-02-09 16:56:32 -06:00
Unknown
ee34309e4a Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	build/Microsoft.DotNet.Cli.Prepare.targets
 2017-02-09 11:00:02 -08:00
Piotr Puszkiewicz
806b294777 Overwrite props files if they exist 2017-02-09 10:50:21 -08:00
Eric Erhardt
454dd10f8d Update dotnet new to use the new 2.0 templates. 2017-02-09 10:18:39 -06:00
Piotr Puszkiewicz
6b7ad0544f small refactor 2017-02-09 00:26:40 -08:00
Livar
a88df7953c Merge branch 'rel/1.0.0' into drop_suffix 2017-02-08 20:35:49 -08:00
Justin Goshi
13fd6d85d7 Remove stuff from prepare.targets 2017-02-08 19:22:56 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Livar Cunha
d373ce8911 Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts. 2017-02-08 18:17:04 -08: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
Justin Goshi
50493d2dab Address PR comments 2017-02-08 14:02:29 -08:00
Justin Goshi
d51bfd1bea Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 11:57:58 -08:00
Eric Erhardt
546d62061a Merge branch 'master' into rel100toMaster 2017-02-08 12:30:32 -06:00
Eric Erhardt
56d391caad Fix up the merge so it gets past Prepare and Compile. 2017-02-08 12:26:04 -06:00