From c3fe0d062f8fafc216ebdec65ef366d4a4503e95 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 3 May 2016 22:30:31 -0700 Subject: [PATCH] Fix package versions --- .../DesktopAppWhichCallsDotnet/project.json | 2 +- .../dotnet-dependency-context-test/project.json | 4 ++-- .../dotnet-dependency-tool-invoker/project.json | 8 ++++---- .../dotnet-desktop-and-portable/project.json | 4 ++-- .../dotnet-desktop-binding-redirects/project.json | 2 +- scripts/dotnet-cli-build/CompileTargets.cs | 4 +++- scripts/dotnet-cli-build/PackageTargets.cs | 10 +++++----- scripts/dotnet-cli-build/Utils/BuildVersion.cs | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 4 ++-- src/Microsoft.DotNet.Compiler.Common/project.json | 8 ++++---- src/Microsoft.DotNet.Files/project.json | 6 +++--- src/Microsoft.DotNet.InternalAbstractions/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 4 ++-- .../project.json | 4 ++-- src/Microsoft.DotNet.ProjectModel/project.json | 4 ++-- src/Microsoft.DotNet.TestFramework/project.json | 4 ++-- src/Microsoft.Extensions.DependencyModel/project.json | 4 ++-- .../project.json | 4 ++-- src/dotnet-compile-fsc/project.json | 8 ++++---- src/dotnet/project.json | 10 +++++----- .../project.json | 8 ++++---- test/dotnet-publish.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 4 ++-- tools/RuntimeGraphGenerator/project.json | 4 ++-- 24 files changed, 59 insertions(+), 57 deletions(-) diff --git a/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json b/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json index e531a3c5e..8d08b9843 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-*" + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-*" }, "compilationOptions": { "emitEntryPoint": true diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 0af291bb9..c7f52b0a9 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0", "compilationOptions": { "emitEntryPoint": true }, @@ -8,7 +8,7 @@ "type": "platform", "version": "1.0.0-rc2-*" }, - "Microsoft.Extensions.DependencyModel": "1.0.0-*" + "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-*" }, "frameworks": { "netcoreapp1.0": { diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index bdf52e12f..c25e13886 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0", "compilationOptions": { "emitEntryPoint": true }, @@ -12,9 +12,9 @@ "type": "platform", "version": "1.0.0-rc2-*" }, - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-*" + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-preview1-*" }, "frameworks": { "netcoreapp1.0": { diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 0aacc6801..457f1a3f3 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0", "compilationOptions": { "emitEntryPoint": true }, @@ -10,7 +10,7 @@ "type": "platform", "version": "1.0.0-rc2-*" } - }, + } }, "net451": {} } diff --git a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json index c256bbc20..b136fbc65 100644 --- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0", "compilationOptions": { "emitEntryPoint": true }, diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index f9ff6ee49..254a88ae1 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -627,7 +627,9 @@ namespace Microsoft.DotNet.Cli.Build outputDir, "--configuration", configuration, - Path.Combine(c.BuildContext.BuildDirectory, "src", project)) + Path.Combine(c.BuildContext.BuildDirectory, "src", project), + "--version-suffix", + buildVersion.VersionSuffix) .Environment("DOTNET_BUILD_VERSION", buildVersion.VersionSuffix) .Execute() .EnsureSuccessful(); diff --git a/scripts/dotnet-cli-build/PackageTargets.cs b/scripts/dotnet-cli-build/PackageTargets.cs index 86dba2985..c5d98e442 100644 --- a/scripts/dotnet-cli-build/PackageTargets.cs +++ b/scripts/dotnet-cli-build/PackageTargets.cs @@ -13,16 +13,16 @@ namespace Microsoft.DotNet.Cli.Build { public static readonly string[] ProjectsToPack = new string[] { + "dotnet-compile-fsc", "Microsoft.DotNet.Cli.Utils", + "Microsoft.DotNet.Compiler.Common", + "Microsoft.DotNet.Files", + "Microsoft.DotNet.InternalAbstractions", "Microsoft.DotNet.ProjectModel", "Microsoft.DotNet.ProjectModel.Loader", "Microsoft.DotNet.ProjectModel.Workspaces", - "Microsoft.DotNet.InternalAbstractions", "Microsoft.Extensions.DependencyModel", - "Microsoft.Extensions.Testing.Abstractions", - "Microsoft.DotNet.Compiler.Common", - "Microsoft.DotNet.Files", - "dotnet-compile-fsc" + "Microsoft.Extensions.Testing.Abstractions" }; [Target(nameof(PackageTargets.CopyCLISDKLayout), diff --git a/scripts/dotnet-cli-build/Utils/BuildVersion.cs b/scripts/dotnet-cli-build/Utils/BuildVersion.cs index cf12daf05..f77c55420 100644 --- a/scripts/dotnet-cli-build/Utils/BuildVersion.cs +++ b/scripts/dotnet-cli-build/Utils/BuildVersion.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build public string ReleaseSuffix { get; set; } public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}"; - public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}"; + public string VersionSuffix => $"{CommitCountString}"; public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}"; public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}"; public string ProductionVersion => $"{Major}.{Minor}.{Patch}"; diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 4136049df..3f3a77727 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,11 +1,11 @@ { - "version": "1.0.0-*", + "version": "1.0.0-preview1-*", "compilationOptions": { "keyFile": "../../tools/Key.snk", "warningsAsErrors": true }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", "NuGet.Versioning": "3.5.0-beta", "NuGet.Packaging": "3.5.0-beta", "NuGet.Frameworks": "3.5.0-beta", diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 566e65511..1ba421586 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -1,13 +1,13 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, "dependencies": { "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.Files": "1.0.0-*" + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.Files": "1.0.0-rc2-preview1-*" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index d16cf3808..805c4f627 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -1,12 +1,12 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", "System.Linq.Expressions": "4.0.11-rc2-24027" }, "frameworks": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index d140d3edb..37fb69e52 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for making code that uses file system and environment testable.", - "version": "1.0.0-*", + "version": "1.0.0-rc2-*", "repository": { "type": "git", "url": "git://github.com/dotnet/cli" diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 0a5102c85..c586ea3de 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,10 +1,10 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", "System.Runtime.Loader": "4.0.0-rc2-24027" }, "frameworks": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index d10b24f7a..f14d1e164 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,8 +4,8 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01" }, "frameworks": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index d57d2d9c4..fa2637b59 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -1,11 +1,11 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-*", "compilationOptions": { "keyFile": "../../tools/Key.snk" }, "description": "Types to model a .NET Project", "dependencies": { - "Microsoft.Extensions.DependencyModel": "1.0.0-*", + "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-*", "Newtonsoft.Json": "7.0.1", "NuGet.Packaging": "3.5.0-beta", "NuGet.RuntimeModel": "3.5.0-beta", diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 2451e2a4f..de9d1ea1e 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "description": "Microsoft.DotNet.TestFramework Class Library", "tags": [ "" @@ -10,7 +10,7 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "Microsoft.DotNet.Cli.Utils": "1.0.0-*" + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 22af45989..64e1523b0 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for reading `.deps` files.", - "version": "1.0.0-*", + "version": "1.0.0-rc2-*", "repository": { "type": "git", "url": "git://github.com/dotnet/cli" @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.DotNet.InternalAbstractions": { "target": "project", - "version": "1.0.0-*" + "version": "1.0.0-rc2-*" }, "Newtonsoft.Json": "7.0.1" }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 3e1c2df30..22091ad49 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "repository": { "type": "git", "url": "git://github.com/dotnet/cli" @@ -12,7 +12,7 @@ }, "dependencies": { "Newtonsoft.Json": "7.0.1", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", "Microsoft.DiaSymReader": "1.0.6", "Microsoft.DiaSymReader.Native": "1.3.3" }, diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 4bf7e04a3..f5db37203 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "compilationOptions": { "emitEntryPoint": true }, @@ -11,9 +11,9 @@ ], "dependencies": { "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-*" diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 4d9e3922c..acbdd88ad 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-*", + "version": "1.0.0-rc2-preview1-*", "compilationOptions": { "emitEntryPoint": true }, @@ -25,10 +25,10 @@ "System.Text.Encoding.CodePages": "4.0.1-rc2-24027", "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027", "Microsoft.ApplicationInsights": "2.0.0", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Compiler.Common": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", + "Microsoft.Extensions.Testing.Abstractions": "1.0.0-rc2-preview1-*", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027", "Microsoft.NETCore.TestHost": "1.0.0-rc2-24027", "Microsoft.NETCore.App": { diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 605b138f6..b8dc0c699 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -8,12 +8,12 @@ "FluentAssertions": "4.0.0", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-173361-36", - "Microsoft.DotNet.TestFramework": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", + "Microsoft.DotNet.TestFramework": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", "Microsoft.DotNet.InternalAbstractions": { "target": "project", - "version": "1.0.0-*" + "version": "1.0.0-rc2-*" } }, "frameworks": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index aadfe5f96..383f35c9b 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -6,7 +6,7 @@ "version": "1.0.0-rc2-*" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027", - "Microsoft.DotNet.TestFramework": "1.0.0-*", + "Microsoft.DotNet.TestFramework": "1.0.0-rc2-preview1-*", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index f37b74075..820d02740 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -6,8 +6,8 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-24027", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*" + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*" }, "frameworks": { "netstandardapp1.5": { diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json index 87cfbaaba..e1a1a091b 100644 --- a/tools/RuntimeGraphGenerator/project.json +++ b/tools/RuntimeGraphGenerator/project.json @@ -8,8 +8,8 @@ "NuGet.Versioning": "3.5.0-beta", "System.CommandLine": "0.1.0-e160119-1", "System.Runtime.Serialization.Json": "4.0.2-rc2-24027", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.Cli.Utils": "1.0.0-*", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*", + "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027", "NETStandard.Library": "1.5.0-rc2-24027" },