Commit graph

55 commits

Author SHA1 Message Date
Livar Cunha
5a0e95897e Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040
* dotnet/release/15.5: (26 commits)
  Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
  One more old style version package name needed to change in redist.
  Fixing the versions of MSBuild and passing the right property to find roslyn files.
  Use "15.5.179" for the other Microsoft.Build.* packages
  Moving the 'MicrosoftBuildPackageVersion' forward.
  Fixing "RuntimeFrameworkVersion"
  Updating version naming convention.
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  ...

	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.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/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Test.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	dir.props
	run-build.sh
	src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
	src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
	src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
	src/dotnet/dotnet.csproj
	src/redist/redist.csproj
	src/tool_fsharp/tool_fsc.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.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/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
2017-12-07 09:55:12 -08:00
John Beisner
f0abfb6b12 Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props 2017-12-01 20:07:48 -08: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
Piotr Puszkiewicz
e617376bc7 Trailing newlines + standardize tabs -> spaces 2017-03-02 20:35:20 -08:00
Eric Erhardt
d4153815d5 Update the CLI to netcoreapp2.0. 2017-01-26 07:28:59 -06:00
Livar Cunha
b41eb43883 Updating our projects and test assets to work with the latest SDK. 2017-01-05 19:44:52 -08:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Livar Cunha
3b081316ad Updating the SDK version in the BundleSdks.props and adding dirs.props back to all csprojs but the TestAssets ones. 2016-12-20 16:38:04 -08:00
Livar Cunha
fadacc0aac Updating the projects files in the repo to use the SDK attribute. 2016-12-20 15:52:50 -08:00
Piotr Puszkiewicz
da82bdb05d Centralize Microsoft.Net.SDK Version (#4890)
* Centralize Microsoft.Net.Sdk package version

Note: Templates were omitted as their version needs to be static.

* Unifying additional missmatched versions

* prefercliruntime

whitespace threw off ReplaceAll

* Additional missed globs

* Revert SDK version for performance tests

* PR Feedback

* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
2016-12-02 09:34:03 -08:00
Justin Goshi
be61afcfa5 Remove unused project.json and .xproj files (#4735)
* Remove unused project.json and .xproj files

* Update the test msi script
2016-11-15 16:12:19 -10:00
Justin Goshi
6d57ca7e14 Migrating all test projects (#4668)
* WIP migrate tests

* WIP fixing more tests

* WIP fix test build break

* Test results files are now trx

* Get CI to pass until we get an xunit xml logger

* Added DotNetTestPJ since that was needed for one test

* Fix build break

* Forgot to add DotNetTestPJ as a build task

* Need to restore project.json for the project used in ubuntu test

* Restore PJ for ubuntu test

* Switch the Ubuntu test to csproj based
2016-11-11 21:46:29 -10: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
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
eerhardt
2aa3dd0843 Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively 2016-06-11 04:29:58 +00:00
eerhardt
7b51f28c7f Updating CoreFx, CoreClr, CoreSetup to rc3-24210-06, rc3-24210-01, rc3-3004449-00 respectively 2016-06-10 15:05:30 +00:00
Eric Erhardt
ef4a8e85ef Updating CoreSetup to rc3-004443-00. 2016-06-10 01:09:46 -05:00
eerhardt
cd9bcd40b3 Updating CoreFx, CoreClr, CoreSetup to rc3-24209-08, rc3-24208-04, rc3-3004442-00 respectively 2016-06-09 21:14:15 -05:00
Eric Erhardt
f43aad780c Updating CoreFx, CoreClr, Roslyn, CoreSetup, DiaSymReader to rc3-24208-04, rc3-24208-04, beta1-20160608-03, rc3-004425, rc2-60608-04 respectively 2016-06-08 22:56:25 -05:00
Eric Erhardt
d2f1fa0300 Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. 2016-06-07 18:24:30 -05:00
Eric Erhardt
334b079995 Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. 2016-06-06 18:56:24 -05:00
Eric Erhardt
42938f180f Updating CoreSetup to rc3-004406 2016-06-06 11:15:07 -05:00
eerhardt
354b1d38d5 Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively 2016-06-06 14:24:51 +00:00
eerhardt
ea8ae8d1c7 Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively 2016-06-04 18:32:34 +00:00
Eric Erhardt
4f95bc0010 Update CoreSetup to rc3-004397 2016-06-04 00:00:28 -05:00
Eric Erhardt
f16f2e64eb Updating CoreFx, CoreSetup, Roslyn to rc3-24201-00, rc3-004391, beta1-20160602-01 2016-06-03 07:27:42 -05:00
Eric Erhardt
351255dda1 Updating CoreSetup to rc3-004373 2016-06-02 14:45:00 -05:00
eerhardt
657c03b625 Updating CoreFx, CoreSetup to rc3-24131-00, rc3-004363 respectively 2016-05-31 20:27:46 +00:00
Eric Erhardt
d50068a5e4 Updating CoreFx, CoreSetup to rc3-24128-00, rc3-004338 respectively 2016-05-31 12:55:36 -05:00
eerhardt
a087de2f87 Updating CoreFx, CoreSetup to rc3-24127-01, rc3-004336 respectively 2016-05-28 00:48:49 +00:00
eerhardt
80820a638b Updating CoreFx, CoreSetup to rc3-24127-00, rc3-004324 respectively 2016-05-27 18:12:45 +00:00
eerhardt
ef76efa02c Updating CoreFx, CoreSetup to rc3-24126-01, rc3-004322 respectively 2016-05-27 08:05:08 +00:00
Eric Erhardt
cc178d425f Update CoreFx, SharedFx to rc3-24126-00, rc3-004312 2016-05-26 13:11:22 -05:00
Bryan
aa01110c33 Remove The host build, consume the host build from core-setup 2016-05-25 14:49:12 -07:00
Bill Wert
ed3bd312cf Fix warnings in project.json
PR #2493 introduced the new project.json schema. The tree has 118 files
with the old schema, which added several hundred warnings.

This change can't go in until PR #2864 does - it relies on those bug
fixes.
2016-05-19 11:51:49 -07:00
Sridhar Periyasamy
1b2b83b6db Upgrade the RC2 branding to RC3.
The following packages are changing:

Microsoft.NetCore.App: 1.0.0-rc2-3002702 -> 1.0.0-rc3-002702
Microsoft.NETCore.DotNetHost: 1.0.1-rc2-002702-00 -> 1.0.1-rc3-002702-00
Microsoft.NETCore.DotNetHostPolicy: 1.0.1-rc2-002702-00 ->
1.0.1-rc3-002702-00
Microsoft.NETCore.DotNetHostResolver: 1.0.1-rc2-002702-00 ->
1.0.1-rc3-002702-00

Also publishing the *deb file to teh debian repo feed is disabled -
https://github.com/dotnet/cli/issues/2973
2016-05-10 13:36:20 -07:00
Eric Erhardt
a567bb8697 Fix test project imports to be consistent.
- Every project.json needs portable-net451+win8 and dotnet5.4 imports (required by dotnet-test-xunit).
- If a test references NuGet, it also needs "netstandardapp1.5", because that the TFM NuGet uses currently.
2016-04-21 11:42:30 -05:00
Eric Erhardt
6ae044e5e1 Fix non-windows builds of Microsoft.NETCore.App.
Fix all test project.jsons to be portable apps.
2016-04-08 09:31:55 -05:00
Eric Erhardt
99371436f3 Consume NETCore.App 2016-04-08 09:27:23 -05:00
Matt Ellis
d0ac16129d Update package dependencies to rc2-24008 2016-04-08 04:05:26 -07:00
eerhardt
3afd85068a Updating dependencies from last known good builds 2016-03-31 11:57:21 -05:00
eerhardt
ea984c50c7 Updating dependencies from last known good builds 2016-03-30 11:49:37 -05:00
eerhardt
7eb9d07fb5 Updating dependencies from last known good builds 2016-03-29 15:59:19 +00:00
Pavel Krymets
18436e325e Make dotnet cli portable 2016-03-28 19:16:02 -07:00
eerhardt
cefed77ca9 Updating dependencies from last known good builds 2016-03-28 17:27:54 +00:00
eerhardt
ed887d183a Updating dependencies from last known good builds 2016-03-25 16:48:25 -05:00
Eric Erhardt
1febe48d71 Updating CoreFX version to rc2-23924 2016-03-24 16:05:24 -05:00
Eric Erhardt
a5813791d5 Updating CoreFX version to rc2-23923 2016-03-24 16:04:37 -05:00
eerhardt
9bc478660a Updating dependencies from last known good builds 2016-03-24 16:02:33 -05:00
Eric Erhardt
964318b291 Revert "Update the .xproj files to reference the "DotNet" targets and props instead of "DNX"."
This reverts commit 4304ca9848.
2016-03-16 11:44:09 -05:00