From cbc1395f596da268c64154ebc8b240dcf07b1aac Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Wed, 22 Jun 2016 15:27:41 -0700 Subject: [PATCH] Update versions for .NET Core RTM --- NuGet.Config | 6 ++++++ src/ImGui.NET.SampleProgram/project.json | 20 +++++++------------- src/ImGui.NET/ImGui.NET.csproj | 1 + src/ImGui.NET/project.json | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 NuGet.Config diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..eba6f65 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ImGui.NET.SampleProgram/project.json b/src/ImGui.NET.SampleProgram/project.json index 972fa33..949ad29 100644 --- a/src/ImGui.NET.SampleProgram/project.json +++ b/src/ImGui.NET.SampleProgram/project.json @@ -1,5 +1,5 @@ { - "compilationOptions": { + "buildOptions": { "allowUnsafe": true, "emitEntryPoint": true, "debugType": "portable" @@ -7,24 +7,18 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-3002520" + "version": "1.0.0" }, "ImGui.NET": { "target": "project" }, - "OpenTK.NETCore": "1.1.2287.6424", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-24019-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24019-00", - "System.ComponentModel": "4.0.1-rc3-24019-00", - "System.Threading.Thread": "4.0.0-rc3-24019-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24019-00", + "OpenTK.NETCore": "1.1.2364.6424", + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027" }, "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50" - } + "netcoreapp1.0": {} }, "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, + "win7-x64": {}, + "ubuntu.14.04-x64": {} }, "content": [ "cimgui.dll", diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj index c7312b8..e8c992e 100644 --- a/src/ImGui.NET/ImGui.NET.csproj +++ b/src/ImGui.NET/ImGui.NET.csproj @@ -8,6 +8,7 @@ ImGuiNET ImGui.NET true + .NETStandard,Version=v1.1 diff --git a/src/ImGui.NET/project.json b/src/ImGui.NET/project.json index bf983bd..db478f6 100644 --- a/src/ImGui.NET/project.json +++ b/src/ImGui.NET/project.json @@ -1,25 +1,25 @@ { - "version": "0.1.4-*", + "version": "0.1.5-*", "description": "A .NET wrapper for the dear ImGui library.", "projectUrl": "https://github.com/mellinoe/imgui.net", "authors": [ "Eric Mellino" ], - "tags": [ - "ImGui ImGui.NET Immediate Mode GUI" - ], - "compilationOptions": { + "packOptions": { + "tags": [ + "ImGui ImGui.NET Immediate Mode GUI" + ] + }, + "buildOptions": { "allowUnsafe": true, "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24019-00", - "System.Numerics.Vectors": "4.1.1-rc3-24019-00", + "System.Numerics.Vectors": "4.1.1", + "System.Runtime.InteropServices": "4.1.0" }, "frameworks": { - "netstandard1.5": { - "imports": [ ] - } + "netstandard1.1": {} }, "packInclude": { "runtimes/win7-x64/native/": "../../deps/cimgui/win7-x64/cimgui.dll",