diff --git a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj index 2ae7ce025..7c813de92 100644 --- a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj +++ b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj index 0bdb79506..9932034ad 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj index 1be153a79..46c045fe4 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj @@ -7,6 +7,6 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj index 68b8ed617..f648c3487 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj @@ -7,6 +7,6 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj index 68b8ed617..f648c3487 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj @@ -7,6 +7,6 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj index e11e31084..d52699c56 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj @@ -6,6 +6,6 @@ net452;netcoreapp2.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj index 0fc35d3d8..e6cf81456 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj @@ -6,6 +6,6 @@ net451;netcoreapp1.0;netstandard1.4 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj index f33aa7821..f0e2e3daa 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj index 8747ed6b7..3df93bb2f 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj index 0b2792110..e4daa90a6 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj index decd23bec..fa3e79ef9 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj index 328fc5fb1..6a07adae0 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index 97e20d00d..82c3d38ea 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -8,7 +8,7 @@ - + diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index a6c5b91c1..474b54070 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -17,9 +17,9 @@ - + - + diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 33cb2b5a7..965ca32df 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 766c1ae66..0efe63453 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssets/TestProjects/MSBuildIntegration/build.props b/TestAssets/TestProjects/MSBuildIntegration/build.props index 3d640d339..edc4720d9 100644 --- a/TestAssets/TestProjects/MSBuildIntegration/build.props +++ b/TestAssets/TestProjects/MSBuildIntegration/build.props @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj index 7a2163613..c8ab8e530 100644 --- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj index 3a31eb5bf..64870d559 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj index 92f102c88..a3f261628 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj index abea1bc3d..0fd2b18ad 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj index 7a2163613..c8ab8e530 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj index 21cce6681..6b530243e 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj @@ -15,7 +15,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj index 21cce6681..6b530243e 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj @@ -15,7 +15,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj index abea1bc3d..0fd2b18ad 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj index 3a31eb5bf..64870d559 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj index 0d07738af..c69bc4462 100644 --- a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj +++ b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj index 1a8fb8e53..80517174a 100644 --- a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/XunitCore/XunitCore.csproj b/TestAssets/TestProjects/XunitCore/XunitCore.csproj index d6016beea..277e9d3d7 100644 --- a/TestAssets/TestProjects/XunitCore/XunitCore.csproj +++ b/TestAssets/TestProjects/XunitCore/XunitCore.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj index 3c971a5e9..c74d87941 100644 --- a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj @@ -12,11 +12,11 @@ - + - + diff --git a/build.proj b/build.proj index 85de07477..060afe7d3 100644 --- a/build.proj +++ b/build.proj @@ -46,10 +46,11 @@ + - + diff --git a/build/BundledSdks.props b/build/BundledSdks.props index b259c4a2a..d5b90bba9 100644 --- a/build/BundledSdks.props +++ b/build/BundledSdks.props @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index a7a7069ab..23d0a8573 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -1,8 +1,8 @@ - - - + + + diff --git a/build/CrossGen.props b/build/CrossGen.props index 8d5dd78ec..a07ed8ba5 100644 --- a/build/CrossGen.props +++ b/build/CrossGen.props @@ -1,8 +1,8 @@ runtime.$(SharedFrameworkRid).microsoft.netcore.app - $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension) - $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(SharedFrameworkRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) + $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools/crossgen$(ExeExtension) + $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(SharedFrameworkRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) $(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7258b411e..983df4239 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,39 +1,68 @@ - 2.0.3 - 15.5.179 - 2.6.0-beta3-62309-01 - 1.6.0-beta2-25304 - 4.2.0-rtm-171104-0 + 2.0.3 + $(MicrosoftNETCoreAppPackageVersion) + 15.5.179 + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + 4.2.0-rtm-171104-0 + 2.6.0-beta3-62309-01 + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + 15.5.0-preview-20171116-1 + $(MicrosoftNETSdkPackageVersion) + 2.0.0-rel-20171010-665 + $(MicrosoftNETSdkWebPackageVersion) + $(MicrosoftNETSdkWebPackageVersion) + 1.0.0-beta3-20171110-312 + 1.0.0-beta3-20171110-312 + $(MicrosoftDotNetCommonProjectTemplates20PackageVersion) + 1.0.0-beta3-20171117-314 + $(MicrosoftTemplateEngineCliPackageVersion) + $(MicrosoftTemplateEngineCliPackageVersion) + $(MicrosoftTemplateEngineCliPackageVersion) + $(MicrosoftTemplateEngineCliPackageVersion) + 2.0.0 + 2.0.0 + 0.1.1-alpha-167 + 1.2.1-alpha-002133 + $(MicrosoftDotNetProjectJsonMigrationPackageVersion) + 1.6.0-beta2-25304 + 4.5.0-rtm-4651 + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + 15.5.0 + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + 0.2.0-beta-000042 + 0.2.0 pre-20171122-1 - 2.6.0-$(CLI_Deps_Satellites_Build) - 4.4.1-$(CLI_Deps_Satellites_Build) + 2.6.0-$(CLI_Deps_Satellites_Build) + 4.4.1-$(CLI_Deps_Satellites_Build) + - - 15.5.0-preview-20171116-1 - $(CLI_NETSDK_Version) + + - 4.5.0-rtm-4651 + + 2.0.1-servicing-25908-02 - 2.0.0-rel-20171010-665 - 15.5.0 - $(CLI_SharedFrameworkVersion) - $(CLI_SharedFrameworkVersion) - $(CLI_SharedFrameworkVersion) - 1.0.0-beta3-20171117-314 - 1.0.0-beta3-20171110-312 - 1.0.0-beta3-20171110-312 - 1.0.0-beta2-20170810-304 - 2.0.0 - 2.0.0 - 0.1.1-alpha-167 - 1.2.1-alpha-002133 - 0.2.0 - 0.2.0-beta-000042 + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + + 1.0.0-beta2-20170810-304 2.0.3 notimestamp @@ -54,4 +83,5 @@ 2.0.0-preview2-25331-01 2.1.0-prerelease-02221-02 + diff --git a/build/DownloadPackageVersions.targets b/build/DownloadPackageVersions.targets new file mode 100644 index 000000000..dc821037b --- /dev/null +++ b/build/DownloadPackageVersions.targets @@ -0,0 +1,9 @@ + + + + + + diff --git a/build/InitRepo.props b/build/InitRepo.props index bc7d7e630..c83437f02 100644 --- a/build/InitRepo.props +++ b/build/InitRepo.props @@ -4,6 +4,8 @@ $(GeneratedPropsDir)/GitCommitInfo.props $(GeneratedPropsDir)/HostInfo.props $(GeneratedPropsDir)/BuildInfo.props + $(GeneratedPropsDir)/OrchestratedPackageVersionsProps.props $(RepoRoot)/NuGet.Config - + + diff --git a/build/InitRepo.targets b/build/InitRepo.targets index 078923dec..9db639072 100644 --- a/build/InitRepo.targets +++ b/build/InitRepo.targets @@ -5,7 +5,8 @@ EnsureGeneratedPropsDirectory; WriteGitCommitInfoProps; WriteHostInfoProps; - WriteBuildInfoProps"/> + WriteBuildInfoProps; + DownloadPackageVersionsProps"/> Microsoft.NET.Build.Extensions 15.0 - $(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(CLI_MSBuildExtensions_Version.ToLower()) + $(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(MicrosoftNETBuildExtensionsPackageVersion.ToLower()) NETStandard.Library.NETFramework $(NuGetPackagesDir)/$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower()) @@ -66,7 +66,7 @@ - + @@ -105,7 +105,7 @@ Text="Failed to determine the NETStandard.Library version pulled in Microsoft.NETCore.App" /> - <_NETCoreAppPackageVersion>$(CLI_SharedFrameworkVersion) + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion) <_NETStandardPackageVersion>@(_NETStandardLibraryVersions->Distinct()) diff --git a/build/MicroBuild.props b/build/MicroBuild.props index 1cf77f45b..efd41d7f8 100644 --- a/build/MicroBuild.props +++ b/build/MicroBuild.props @@ -6,6 +6,6 @@ $(NUGET_PACKAGES) $(RepoRoot)/.nuget/packages - $(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/ + $(NuGetPackagesDir)/microbuild.core/$(MicroBuildCorePackageVersion)/build/ diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 8aba7ac72..06d67c109 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -10,33 +10,33 @@ - - - + + + ]]> - - - - - - - - - - - - + + + + + + + + + + + + + ]]> + ]]> diff --git a/build/Test.targets b/build/Test.targets index 0b8bc0620..83591e179 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -46,7 +46,7 @@ - + netcoreapp2.0 - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets index 5ba7482bf..5da9ffd49 100644 --- a/build/publish/RuntimeCoherence.targets +++ b/build/publish/RuntimeCoherence.targets @@ -19,7 +19,7 @@ false - true + true diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 07a4de29d..26a9bf2cd 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -15,19 +15,19 @@ - + - - + + - - + + diff --git a/build_projects/update-dependencies/Program.cs b/build_projects/update-dependencies/Program.cs index e256564d6..27926a77c 100644 --- a/build_projects/update-dependencies/Program.cs +++ b/build_projects/update-dependencies/Program.cs @@ -81,9 +81,9 @@ namespace Microsoft.DotNet.Scripts private static IEnumerable GetUpdaters() { string dependencyVersionsPath = Path.Combine("build", "DependencyVersions.props"); - yield return CreateRegexUpdater(dependencyVersionsPath, "CLI_SharedFrameworkVersion", "Microsoft.NETCore.App"); - yield return CreateRegexUpdater(dependencyVersionsPath, "PlatformAbstractionsVersion", "Microsoft.DotNet.PlatformAbstractions"); - yield return CreateRegexUpdater(dependencyVersionsPath, "DependencyModelVersion", "Microsoft.Extensions.DependencyModel"); + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftNETCoreAppPackageVersion", "Microsoft.NETCore.App"); + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftDotNetPlatformAbstractionsPackageVersion", "Microsoft.DotNet.PlatformAbstractions"); + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftExtensionsDependencyModelPackageVersion", "Microsoft.Extensions.DependencyModel"); } private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId) diff --git a/run-build.sh b/run-build.sh index 95154cdf6..597268b25 100755 --- a/run-build.sh +++ b/run-build.sh @@ -188,7 +188,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 echo "${args[@]}" if [ $BUILD -eq 1 ]; then - dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles + dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles "${args[@]}" dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS "${args[@]}" else echo "Not building due to --nobuild" diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index 04b8f25be..368cbdc14 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 2b23027fd..518040d30 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -24,6 +24,6 @@ - + diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index ed1056755..bcf9bd712 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -16,16 +16,16 @@ - - - - - - - - + + + + + + + + - + diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 25a33c6f8..0b4daa29e 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index ca8867c75..f804fa356 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 71da96676..928a17ccb 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -52,23 +52,23 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index dcfa97725..85affbc87 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -7,7 +7,7 @@ $(CliVersionPrefix) netcoreapp2.0 - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true false $(AssetTargetFallback);dotnet5.4 @@ -16,12 +16,12 @@ - - - - - - + + + + + + All @@ -354,7 +354,7 @@ $(PublishDir)/vstest.console.runtimeconfig.json "version": ".*" - "version": "$(CLI_SharedFrameworkVersion)" + "version": "$(MicrosoftNETCoreAppPackageVersion)" - - - + + + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 7a109b08d..9a4974600 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -9,8 +9,8 @@ - - - + + + diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 5a4e4121f..9b373cb60 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index c71c5cf15..fbafac34b 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) ArgumentForwardingTests Exe $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -18,7 +18,7 @@ - + $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) ArgumentsReflector Exe diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index 83c4a521a..8cb5233b6 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) EndToEnd Exe $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -26,6 +26,6 @@ - + diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index 0cc22883c..138cc5eea 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true Microsoft.DotNet.Cli.Sln.Internal.Tests ../../tools/test_key.snk @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index dce7b8e2e..1a5f9fe31 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) Microsoft.DotNet.Cli.Utils.Tests Exe ../../tools/Key.snk @@ -32,13 +32,13 @@ - - - - + + + + - - + + diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj index 69269abf5..d29825acd 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true Microsoft.DotNet.Configurer.UnitTests ../../tools/Key.snk diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index a21bb4731..b009123c0 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -4,7 +4,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) Exe ../../tools/Key.snk true @@ -17,12 +17,12 @@ - + - - + + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index c13629f52..2ac3bfe37 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index ded34abd0..ba6e65af5 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) Msbuild.Tests.Utilities $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -20,7 +20,7 @@ - - + + diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index 7922a876d..072bc6352 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true binding-redirects.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -14,9 +14,9 @@ - + - + diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 980cd78e7..3050759b4 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true crossgen.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj index 36ec73b00..9dc27f338 100644 --- a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj +++ b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-add-package.Tests ../../tools/Key.snk @@ -22,9 +22,9 @@ - + - + diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 46b4c5b3a..a023511e3 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-add-reference.Tests ../../tools/Key.snk @@ -24,7 +24,7 @@ - - + + diff --git a/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj b/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj index 0b7b9fa26..6b380559f 100644 --- a/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj +++ b/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-back-compat.Tests @@ -13,7 +13,7 @@ - + diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index d72a8f986..95f80d6bf 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-build.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj index 831a64d3b..2cec39474 100644 --- a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj +++ b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-clean.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index 88443c674..70ce3486e 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-help.Tests ../../tools/Key.snk @@ -20,7 +20,7 @@ - + diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index c62326007..32b249ed5 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-list-reference.Tests ../../tools/Key.snk @@ -23,6 +23,6 @@ - + diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 2a9fe2963..0bc0b107c 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-migrate.Tests $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -28,6 +28,6 @@ - + diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index 4a20f6cf9..cc45fc290 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-msbuild.Tests ../../tools/Key.snk diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 7dc7368f6..1d5513241 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-new.Tests $(AssetTargetFallback);dnxcore50;portable-net45+win8 @@ -17,7 +17,7 @@ - + diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index 327ad4bec..842ad9f2b 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-nuget.UnitTests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index 755ce3f43..98ab08de7 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-pack.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index 5641910fa..befc31f08 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-publish.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj b/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj index 84669fe6d..7b6cbba9e 100644 --- a/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj +++ b/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-remove-package.Tests ../../tools/Key.snk @@ -22,8 +22,8 @@ - + - + diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index 53a68dce5..315b5a6ad 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-remove-reference.Tests ../../tools/Key.snk @@ -22,8 +22,8 @@ - + - + diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index 812246448..a8be52dc0 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-restore.Tests $(AssetTargetFallback);dnxcore50;portable-net45+win8 @@ -17,9 +17,9 @@ - + - + diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index e1b7fbe50..efde5f7cf 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-run.Tests ../../tools/Key.snk diff --git a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj index 6bc9287df..66b78a5f1 100644 --- a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj +++ b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-sln-add.Tests ../../tools/Key.snk @@ -25,6 +25,6 @@ - + diff --git a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj index a7b806863..a315be891 100644 --- a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj +++ b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-sln-list.Tests ../../tools/Key.snk diff --git a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj index 8609bdb05..6c2176c9a 100644 --- a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj +++ b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-sln-remove.Tests ../../tools/Key.snk diff --git a/test/dotnet-store.Tests/dotnet-store.Tests.csproj b/test/dotnet-store.Tests/dotnet-store.Tests.csproj index 650b63b6a..b3935c5cc 100644 --- a/test/dotnet-store.Tests/dotnet-store.Tests.csproj +++ b/test/dotnet-store.Tests/dotnet-store.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-cache.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index a47ee9357..fec1c07a6 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-test.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index c774406bd..5b89d32d0 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-vstest.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 12467295b..2aa66d8e5 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet.Tests ../../tools/Key.snk @@ -41,7 +41,7 @@ - - + + diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index cab0ce168..cbec7422a 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true msbuild.IntegrationTests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index e29aa4cdb..3e5f83352 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -7,7 +7,7 @@ - + diff --git a/tools/Signing.Dependencies/Signing.Dependencies.csproj b/tools/Signing.Dependencies/Signing.Dependencies.csproj index c98ee321a..55fef49e4 100644 --- a/tools/Signing.Dependencies/Signing.Dependencies.csproj +++ b/tools/Signing.Dependencies/Signing.Dependencies.csproj @@ -6,7 +6,7 @@ - +