Skip to content
  • Livar Cunha's avatar
    Merge remote-tracking branch 'dotnet/release/15.5' into... · 5a0e9589
    Livar Cunha authored
    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
    5a0e9589