Commit graph

66 commits

Author SHA1 Message Date
John Beisner
004d00b91e Formatting... 2017-12-11 14:45:06 -08:00
John Beisner
b253a772f0 NuGet.Config is no longer present - therefore, explicitly state where to get this script's dependencies. 2017-12-11 13:04:41 -08:00
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
Eric Erhardt
a36d67fe07 Fix update-dependencies by using the correct TFM.
stage0 comes with 2.1 runtime now, so need to use netcoreapp2.1.
2017-09-06 19:55:13 -05:00
Eric Erhardt
0491fd3826 Fix update-dependencies.
Don't import the root Directory.Build.props during update-dependencies because it imports generated .props files that don't exist outside of the build.
2017-09-06 15:27:16 -05:00
John Doe
8fc8a03081 typo 2017-08-14 21:26:49 -07:00
Eric Erhardt
6119a29f83 Reenable UpdateVersionsRepo
Now that https://github.com/dotnet/buildtools/issues/1547 is fixed.
2017-06-23 09:09:56 -05: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
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
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
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
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
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
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
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
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
Matt Ellis
921c116c65 Consume local info support from VersionTools
Davis added support for VersionTools to be able to pull from a local
filesystem layout that looks like what we have in GitHub on
dotnet/versions.

Start to consume this so a composed build can use this logic to update
dependencies using local version information produced during the build.
2017-02-21 16:56:00 -05:00
Justin Goshi
8e58a247b0 Finish renaming props file to remove Microsoft.Dotnet.Cli prefix 2017-02-16 11:16:20 -08:00
Matt Ellis
5d932c6aba Get update-dependenices working again
- Fix build issues due to .props file not existing on a clean
  enlistment
- Fix path separator issues on *NIX
- Add update-dependencies.sh
- Support -Update in update-dependencies.ps1
2017-02-13 17:30:33 -08:00
Eric Erhardt
31ff72e62d Respond to PR feedback. 2017-02-10 11:53:27 -06:00
Eric Erhardt
1e20550f5d Upgrade update-dependencies script.
- Take the latest VersionTools, so we can take advantage of new features.
- Update what files need to be updated - DependencyVersions.props.
- Clean up the powershell script.
2017-02-09 16:56:19 -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
Krzysztof Wicher
746d92337a fix build errors and remove cross project cs dependency in update-dependencies.csproj 2016-12-29 15:57:18 -08: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
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
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
Eric Erhardt
eada6913c4 PR feedback 2016-07-15 19:52:20 -05:00
Eric Erhardt
a27d02eb66 Move to buildtools' VersionTools for update-dependencies. 2016-07-15 19:41:29 -05:00
Livar Cunha
cdddc2e432 Addressing code review comments. Fixing issue with compile where we were not copying the msbuild files to the right place. Fixed an issue where we were trying to download installers for OSes that don't have installers. Added init-tools scripts. 2016-07-06 12:03:16 -07:00
Senthil
263b80ecbb Add HostFXR to UpdateDependencies 2016-06-14 02:09:59 -07:00
jacalvar
635c3331df Update to Json.NET 9.0.1 2016-06-14 03:21:56 -05:00
Eric Erhardt
a4cef6d367 Updating NuGet to beta2-1484 2016-06-14 03:19:04 -05:00
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
Eric Erhardt
c1c7ca06c2 Update NuGet to 3.5.0-beta2-1480 2016-06-11 12:23:24 -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
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
Zhi Li
9a9864bf68 Update NuGet Version to 3.5.0-beta2-1451 2016-06-09 07:52:00 -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
Ajay Bhargav Baaskaran
4a88cff185 [Fixes #3255] Added a web template to dotnet new 2016-06-08 11:31:08 -07: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
82ef0304bb Crossgen now requires a Jit package to be specified.
Port Crossgen fix from core-setup.

See a2857af7e3
2016-06-07 18:22:52 -05:00
Eric Erhardt
748516bb0d Add CoreClr dependency to CLI's update-dependencies. 2016-06-07 18:22:52 -05:00
Jonathan Miller
cdf4407419 Bumping JSON.NET to 9.0.1 2016-06-07 15:04:17 -07:00
Rohit Agrawal
5378f5a697 update nuget to 3.5.0-beta2-1392 2016-06-06 14:14:20 -07: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
9ffe91f367 Move dependency from Microsoft.NETCore.Runtime to Microsoft.NETCore.Runtime.CoreCLR. 2016-06-03 16:35:00 -05:00