mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix package versions

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-05-03 22:30:31 -07:00 • committed by Bryan
parent 82e6b0408a
commit c3fe0d062f
24 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/DesktopAppWhichCallsDotnet/project.json
View file

@ -1,7 +1,7 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*" "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

4
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
@ -8,7 +8,7 @@
"type": "platform", "type": "platform",
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"
}, },
"Microsoft.Extensions.DependencyModel": "1.0.0-*" "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

8
TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
@ -12,9 +12,9 @@
"type": "platform", "type": "platform",
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"
}, },
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*" "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-preview1-*"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

4
TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
@ -10,7 +10,7 @@
"type": "platform", "type": "platform",
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"
} }
}, }
}, },
"net451": {} "net451": {}
} }

2
TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },

4
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -627,7 +627,9 @@ namespace Microsoft.DotNet.Cli.Build
outputDir, outputDir,
"--configuration", "--configuration",
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) .Environment("DOTNET_BUILD_VERSION", buildVersion.VersionSuffix)
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();

10
scripts/dotnet-cli-build/PackageTargets.cs
View file

@ -13,16 +13,16 @@ namespace Microsoft.DotNet.Cli.Build
{ {
public static readonly string[] ProjectsToPack = new string[] public static readonly string[] ProjectsToPack = new string[]
{ {
"dotnet-compile-fsc",
"Microsoft.DotNet.Cli.Utils", "Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.Compiler.Common",
"Microsoft.DotNet.Files",
"Microsoft.DotNet.InternalAbstractions",
"Microsoft.DotNet.ProjectModel", "Microsoft.DotNet.ProjectModel",
"Microsoft.DotNet.ProjectModel.Loader", "Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Workspaces", "Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.DotNet.InternalAbstractions",
"Microsoft.Extensions.DependencyModel", "Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions", "Microsoft.Extensions.Testing.Abstractions"
"Microsoft.DotNet.Compiler.Common",
"Microsoft.DotNet.Files",
"dotnet-compile-fsc"
}; };
[Target(nameof(PackageTargets.CopyCLISDKLayout), [Target(nameof(PackageTargets.CopyCLISDKLayout),

2
scripts/dotnet-cli-build/Utils/BuildVersion.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
public string ReleaseSuffix { get; set; } public string ReleaseSuffix { get; set; }
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}"; 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 NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}"; public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}"; public string ProductionVersion => $"{Major}.{Minor}.{Patch}";

4
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -1,11 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-preview1-*",
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"NuGet.Versioning": "3.5.0-beta", "NuGet.Versioning": "3.5.0-beta",
"NuGet.Packaging": "3.5.0-beta", "NuGet.Packaging": "3.5.0-beta",
"NuGet.Frameworks": "3.5.0-beta", "NuGet.Frameworks": "3.5.0-beta",

8
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -1,13 +1,13 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-preview1-*",
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01", "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.Files": "1.0.0-*" "Microsoft.DotNet.Files": "1.0.0-rc2-preview1-*"
}, },
"frameworks": { "frameworks": {
"net451": { "net451": {

6
src/Microsoft.DotNet.Files/project.json
View file

@ -1,12 +1,12 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-preview1-*",
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"description": "Abstraction to interact with the file system and file paths.", "description": "Abstraction to interact with the file system and file paths.",
"dependencies": { "dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"System.Linq.Expressions": "4.0.11-rc2-24027" "System.Linq.Expressions": "4.0.11-rc2-24027"
}, },
"frameworks": { "frameworks": {

2
src/Microsoft.DotNet.InternalAbstractions/project.json
View file

@ -1,6 +1,6 @@
{ {
"description": "Abstractions for making code that uses file system and environment testable.", "description": "Abstractions for making code that uses file system and environment testable.",
"version": "1.0.0-*", "version": "1.0.0-rc2-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/dotnet/cli" "url": "git://github.com/dotnet/cli"

4
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -1,10 +1,10 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-preview1-*",
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"System.Runtime.Loader": "4.0.0-rc2-24027" "System.Runtime.Loader": "4.0.0-rc2-24027"
}, },
"frameworks": { "frameworks": {

4
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -4,8 +4,8 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01" "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01"
}, },
"frameworks": { "frameworks": {

4
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -1,11 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-*",
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyModel": "1.0.0-*", "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-*",
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"NuGet.Packaging": "3.5.0-beta", "NuGet.Packaging": "3.5.0-beta",
"NuGet.RuntimeModel": "3.5.0-beta", "NuGet.RuntimeModel": "3.5.0-beta",

4
src/Microsoft.DotNet.TestFramework/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-preview1-*",
"description": "Microsoft.DotNet.TestFramework Class Library", "description": "Microsoft.DotNet.TestFramework Class Library",
"tags": [ "tags": [
"" ""
@ -10,7 +10,7 @@
"projectUrl": "", "projectUrl": "",
"licenseUrl": "", "licenseUrl": "",
"dependencies": { "dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*" "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.5": {

4
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -1,6 +1,6 @@
{ {
"description": "Abstractions for reading `.deps` files.", "description": "Abstractions for reading `.deps` files.",
"version": "1.0.0-*", "version": "1.0.0-rc2-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/dotnet/cli" "url": "git://github.com/dotnet/cli"
@ -12,7 +12,7 @@
"dependencies": { "dependencies": {
"Microsoft.DotNet.InternalAbstractions": { "Microsoft.DotNet.InternalAbstractions": {
"target": "project", "target": "project",
"version": "1.0.0-*" "version": "1.0.0-rc2-*"
}, },
"Newtonsoft.Json": "7.0.1" "Newtonsoft.Json": "7.0.1"
}, },

4
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -1,6 +1,6 @@
{ {
"description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", "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": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/dotnet/cli" "url": "git://github.com/dotnet/cli"
@ -12,7 +12,7 @@
}, },
"dependencies": { "dependencies": {
"Newtonsoft.Json": "7.0.1", "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": "1.0.6",
"Microsoft.DiaSymReader.Native": "1.3.3" "Microsoft.DiaSymReader.Native": "1.3.3"
}, },

8
src/dotnet-compile-fsc/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-preview1-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
@ -11,9 +11,9 @@
], ],
"dependencies": { "dependencies": {
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318", "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"type": "platform", "type": "platform",
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"

10
src/dotnet/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-rc2-preview1-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
@ -25,10 +25,10 @@
"System.Text.Encoding.CodePages": "4.0.1-rc2-24027", "System.Text.Encoding.CodePages": "4.0.1-rc2-24027",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027", "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
"Microsoft.ApplicationInsights": "2.0.0", "Microsoft.ApplicationInsights": "2.0.0",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", "Microsoft.Extensions.Testing.Abstractions": "1.0.0-rc2-preview1-*",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-24027", "Microsoft.NETCore.TestHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {

8
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -8,12 +8,12 @@
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-173361-36", "dotnet-test-xunit": "1.0.0-rc2-173361-36",
"Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.TestFramework": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.InternalAbstractions": { "Microsoft.DotNet.InternalAbstractions": {
"target": "project", "target": "project",
"version": "1.0.0-*" "version": "1.0.0-rc2-*"
} }
}, },
"frameworks": { "frameworks": {

2
test/dotnet-publish.Tests/project.json
View file

@ -6,7 +6,7 @@
"version": "1.0.0-rc2-*" "version": "1.0.0-rc2-*"
}, },
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027", "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": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

4
tools/MultiProjectValidator/project.json
View file

@ -6,8 +6,8 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027", "NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*" "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*"
}, },
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netstandardapp1.5": {

4
tools/RuntimeGraphGenerator/project.json
View file

@ -8,8 +8,8 @@
"NuGet.Versioning": "3.5.0-beta", "NuGet.Versioning": "3.5.0-beta",
"System.CommandLine": "0.1.0-e160119-1", "System.CommandLine": "0.1.0-e160119-1",
"System.Runtime.Serialization.Json": "4.0.2-rc2-24027", "System.Runtime.Serialization.Json": "4.0.2-rc2-24027",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-rc2-preview1-*",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027" "NETStandard.Library": "1.5.0-rc2-24027"
}, },