Skip to content

Commit 46d554d

Browse files
Reference updated to latest and Release new package to nuget
1 parent 7ebc7f1 commit 46d554d

File tree

12 files changed

+24
-56
lines changed

12 files changed

+24
-56
lines changed

Examples/ImageExamples/ImageExamples.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<Configurations>Debug;Release;Py3.6_WIN;Py2.7_WIN;Py3.6_OSX;Py2.7_Mono;Py3.6_Mono;Py2.7_OSX</Configurations>
77
<Platforms>AnyCPU;x64</Platforms>
88
</PropertyGroup>

Examples/Keras.Playground/Keras.Playground.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
<Configurations>Debug;Release;Py3.6_WIN;Py2.7_WIN;Py3.6_OSX;Py2.7_Mono;Py3.6_Mono;Py2.7_OSX</Configurations>
77
<Platforms>AnyCPU;x64</Platforms>

Examples/KerasExampleWinApp/KerasExampleWinApp.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="Numpy.Bare, Version=3.7.1.4, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\Numpy.Bare.3.8.1.22\lib\netstandard2.0\Numpy.Bare.dll</HintPath>
38+
<HintPath>..\..\packages\Numpy.Bare.3.8.1.25\lib\netstandard2.0\Numpy.Bare.dll</HintPath>
39+
</Reference>
40+
<Reference Include="Python.Runtime, Version=2.5.2.0, Culture=neutral, processorArchitecture=AMD64">
41+
<HintPath>..\..\packages\pythonnet_netstandard_py38_win.2.5.2\lib\netstandard2.0\Python.Runtime.dll</HintPath>
3942
</Reference>
4043
<Reference Include="System" />
4144
<Reference Include="System.Core" />
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net472" />
4-
<package id="Numpy.Bare" version="3.8.1.22" targetFramework="net472" />
5-
<package id="pythonnet_netstandard_py38_win" version="2.5.1" targetFramework="net472" />
6-
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net472" />
3+
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
4+
<package id="Numpy.Bare" version="3.8.1.25" targetFramework="net472" />
5+
<package id="pythonnet_netstandard_py38_win" version="2.5.2" targetFramework="net472" />
6+
<package id="System.Reflection.Emit" version="4.7.0" targetFramework="net472" />
77
</packages>

Examples/MusicGeneration/MusicGeneration.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Melanchall.DryWetMidi" Version="5.1.0" />
10-
<PackageReference Include="NAudio" Version="1.10.0" />
9+
<PackageReference Include="Melanchall.DryWetMidi" Version="5.2.1" />
10+
<PackageReference Include="NAudio" Version="2.0.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

Examples/TextExamples/TextExamples.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<Configurations>Debug;Release;Py3.6_WIN;Py2.7_WIN;Py3.6_OSX;Py2.7_Mono;Py3.6_Mono;Py2.7_OSX</Configurations>
77
<Platforms>AnyCPU;x64</Platforms>
88
</PropertyGroup>

Keras.NET.sln

+1-36
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "doc-gen", "doc-gen\doc-gen.
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageExamples", "Examples\ImageExamples\ImageExamples.csproj", "{EC18ED5C-A9EC-414F-948C-DD1BC052D312}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Keras.Playground", "Examples\Keras.Playground\Keras.Playground.csproj", "{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}"
17-
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextExamples", "Examples\TextExamples\TextExamples.csproj", "{7F906C3D-4C18-4185-8235-4908FC082398}"
1917
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Keras", "Keras\Keras.csproj", "{BA3012C1-D49A-4520-A7FB-D033DA9E63ED}"
@@ -23,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReleaseBot", "ReleaseBot\Re
2321
EndProject
2422
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KerasExampleWinApp", "Examples\KerasExampleWinApp\KerasExampleWinApp.csproj", "{0C0B0830-4871-4979-8675-93F980F5EBE2}"
2523
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicGeneration", "Examples\MusicGeneration\MusicGeneration.csproj", "{108C3326-58D2-4C26-9D78-5F045D620A26}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicGeneration", "Examples\MusicGeneration\MusicGeneration.csproj", "{108C3326-58D2-4C26-9D78-5F045D620A26}"
2725
EndProject
2826
Global
2927
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -169,38 +167,6 @@ Global
169167
{EC18ED5C-A9EC-414F-948C-DD1BC052D312}.Release|Any CPU.Build.0 = Release|Any CPU
170168
{EC18ED5C-A9EC-414F-948C-DD1BC052D312}.Release|x64.ActiveCfg = Release|Any CPU
171169
{EC18ED5C-A9EC-414F-948C-DD1BC052D312}.Release|x64.Build.0 = Release|Any CPU
172-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
174-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Debug|x64.ActiveCfg = Debug|x64
175-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Debug|x64.Build.0 = Debug|x64
176-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_Mono|Any CPU.ActiveCfg = Py2.7_Mono|Any CPU
177-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_Mono|Any CPU.Build.0 = Py2.7_Mono|Any CPU
178-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_Mono|x64.ActiveCfg = Py2.7_Mono|Any CPU
179-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_Mono|x64.Build.0 = Py2.7_Mono|Any CPU
180-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_OSX|Any CPU.ActiveCfg = Py2.7_OSX|Any CPU
181-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_OSX|Any CPU.Build.0 = Py2.7_OSX|Any CPU
182-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_OSX|x64.ActiveCfg = Py2.7_OSX|Any CPU
183-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_OSX|x64.Build.0 = Py2.7_OSX|Any CPU
184-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_WIN|Any CPU.ActiveCfg = Py2.7_WIN|Any CPU
185-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_WIN|Any CPU.Build.0 = Py2.7_WIN|Any CPU
186-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_WIN|x64.ActiveCfg = Py2.7_WIN|Any CPU
187-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py2.7_WIN|x64.Build.0 = Py2.7_WIN|Any CPU
188-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_Mono|Any CPU.ActiveCfg = Py3.6_Mono|Any CPU
189-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_Mono|Any CPU.Build.0 = Py3.6_Mono|Any CPU
190-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_Mono|x64.ActiveCfg = Py3.6_Mono|Any CPU
191-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_Mono|x64.Build.0 = Py3.6_Mono|Any CPU
192-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_OSX|Any CPU.ActiveCfg = Py3.6_OSX|Any CPU
193-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_OSX|Any CPU.Build.0 = Py3.6_OSX|Any CPU
194-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_OSX|x64.ActiveCfg = Py3.6_OSX|Any CPU
195-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_OSX|x64.Build.0 = Py3.6_OSX|Any CPU
196-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_WIN|Any CPU.ActiveCfg = Py3.6_WIN|Any CPU
197-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_WIN|Any CPU.Build.0 = Py3.6_WIN|Any CPU
198-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_WIN|x64.ActiveCfg = Py3.6_WIN|Any CPU
199-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Py3.6_WIN|x64.Build.0 = Py3.6_WIN|Any CPU
200-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
201-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Release|Any CPU.Build.0 = Release|Any CPU
202-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Release|x64.ActiveCfg = Release|Any CPU
203-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4}.Release|x64.Build.0 = Release|Any CPU
204170
{7F906C3D-4C18-4185-8235-4908FC082398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205171
{7F906C3D-4C18-4185-8235-4908FC082398}.Debug|Any CPU.Build.0 = Debug|Any CPU
206172
{7F906C3D-4C18-4185-8235-4908FC082398}.Debug|x64.ActiveCfg = Debug|x64
@@ -358,7 +324,6 @@ Global
358324
GlobalSection(NestedProjects) = preSolution
359325
{A0786763-88EC-41DB-9E4F-6DDACA1A1162} = {96B07D94-46E0-4A1C-9484-E842B47FFE04}
360326
{EC18ED5C-A9EC-414F-948C-DD1BC052D312} = {96B07D94-46E0-4A1C-9484-E842B47FFE04}
361-
{FE785E8B-0DA8-4E42-8A8A-E5B2C4FCC2E4} = {96B07D94-46E0-4A1C-9484-E842B47FFE04}
362327
{7F906C3D-4C18-4185-8235-4908FC082398} = {96B07D94-46E0-4A1C-9484-E842B47FFE04}
363328
{0C0B0830-4871-4979-8675-93F980F5EBE2} = {96B07D94-46E0-4A1C-9484-E842B47FFE04}
364329
{108C3326-58D2-4C26-9D78-5F045D620A26} = {96B07D94-46E0-4A1C-9484-E842B47FFE04}

Keras.UnitTest/Keras.UnitTest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
25-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
26-
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
25+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
26+
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

ReleaseBot/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ static void Main(string[] args)
2828
var specs = new ReleaseSpec[]
2929
{
3030
// linux
31-
new ReleaseSpec() { CPythonVersion = "2.7", Platform="Linux", },
31+
//new ReleaseSpec() { CPythonVersion = "2.7", Platform="Linux", },
3232
new ReleaseSpec() { CPythonVersion = "3.7", Platform="Linux", },
3333
new ReleaseSpec() { CPythonVersion = "3.8", Platform="Linux", },
3434
// mac
35-
new ReleaseSpec() { CPythonVersion = "2.7", Platform="OSX", },
35+
//new ReleaseSpec() { CPythonVersion = "2.7", Platform="OSX", },
3636
new ReleaseSpec() { CPythonVersion = "3.7", Platform="OSX", },
3737
new ReleaseSpec() { CPythonVersion = "3.8", Platform="OSX", },
3838
// win
39-
new ReleaseSpec() { CPythonVersion = "2.7", Platform="Win64", },
39+
//new ReleaseSpec() { CPythonVersion = "2.7", Platform="Win64", },
4040
new ReleaseSpec() { CPythonVersion = "3.7", Platform="Win64", },
4141
new ReleaseSpec() { CPythonVersion = "3.8", Platform="Win64", },
4242
};

ReleaseBot/ReleaseBot.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<Prefer32Bit>true</Prefer32Bit>
5555
</PropertyGroup>
5656
<ItemGroup>
57-
<Reference Include="HtmlAgilityPack, Version=1.11.23.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
58-
<HintPath>..\packages\HtmlAgilityPack.1.11.23\lib\Net45\HtmlAgilityPack.dll</HintPath>
57+
<Reference Include="HtmlAgilityPack, Version=1.11.36.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
58+
<HintPath>..\packages\HtmlAgilityPack.1.11.36\lib\Net45\HtmlAgilityPack.dll</HintPath>
5959
</Reference>
6060
<Reference Include="System" />
6161
<Reference Include="System.Configuration" />

ReleaseBot/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HtmlAgilityPack" version="1.11.23" targetFramework="net472" />
3+
<package id="HtmlAgilityPack" version="1.11.36" targetFramework="net472" />
44
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
55
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
66
</packages>

doc-gen/doc-gen.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="docfx.console" Version="2.51.0">
10+
<PackageReference Include="docfx.console" Version="2.58.4">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>

0 commit comments

Comments
 (0)