瀏覽代碼

Target net46 instead of 461

Brad Robinson 6 年之前
父節點
當前提交
b6f26dd8bd
共有 8 個文件被更改,包括 18 次插入18 次删除
  1. 5 5
      PetaJson.Debug.nuspec
  2. 5 5
      PetaJson.nuspec
  3. 1 1
      PetaJson/PetaJson.csproj
  4. 1 1
      build.js
  5. 3 3
      version.cs
  6. 1 1
      version.h
  7. 1 1
      version.json
  8. 1 1
      version.props

+ 5 - 5
PetaJson.Debug.nuspec

@@ -14,18 +14,18 @@
   <files>
 
     <!-- .NET Framework -->
-    <file src=".\Build\Debug\PetaJson\net461\PetaJson.*" target="lib/net461" />
+    <file src=".\Build\Debug\PetaJson\net46\PetaJson.*" target="lib/net46" />
 
     <!-- netstandard2.0 -->
-    <file src=".\Build\Debug\PetaJson\netcoreapp2.0\PetaJson.*" target="ref/netstandard2.0" />
+    <file src=".\Build\Debug\PetaJson\net46\PetaJson.*" target="ref/netstandard2.0" />
 
     <!-- netcore2.0 -->
     <file src=".\Build\Debug\PetaJson\netcoreapp2.0\PetaJson.*" target="ref/netcoreapp2.0" />
     <file src=".\Build\Debug\PetaJson\netcoreapp2.0\PetaJson.*" target="runtimes/any/lib/netcoreapp2.0" />
 
-    <!-- net461 -->
-    <file src=".\Build\Debug\PetaJson\net461\PetaJson.*" target="ref/net461" />
-    <file src=".\Build\Debug\PetaJson\net461\PetaJson.*" target="runtimes/any/lib/net461" />
+    <!-- net46 -->
+    <file src=".\Build\Debug\PetaJson\net46\PetaJson.*" target="ref/net46" />
+    <file src=".\Build\Debug\PetaJson\net46\PetaJson.*" target="runtimes/any/lib/net46" />
 
   </files>
 </package>

+ 5 - 5
PetaJson.nuspec

@@ -14,18 +14,18 @@
   <files>
 
     <!-- .NET Framework -->
-    <file src=".\Build\Release\PetaJson\net461\PetaJson.*" target="lib/net461" />
+    <file src=".\Build\Release\PetaJson\net46\PetaJson.*" target="lib/net46" />
 
     <!-- netstandard2.0 -->
-    <file src=".\Build\Release\PetaJson\netcoreapp2.0\PetaJson.*" target="ref/netstandard2.0" />
+    <file src=".\Build\Release\PetaJson\net46\PetaJson.*" target="ref/netstandard2.0" />
 
     <!-- netcore2.0 -->
     <file src=".\Build\Release\PetaJson\netcoreapp2.0\PetaJson.*" target="ref/netcoreapp2.0" />
     <file src=".\Build\Release\PetaJson\netcoreapp2.0\PetaJson.*" target="runtimes/any/lib/netcoreapp2.0" />
 
-    <!-- net461 -->
-    <file src=".\Build\Release\PetaJson\net461\PetaJson.*" target="ref/net461" />
-    <file src=".\Build\Release\PetaJson\net461\PetaJson.*" target="runtimes/any/lib/net461" />
+    <!-- net46 -->
+    <file src=".\Build\Release\PetaJson\net46\PetaJson.*" target="ref/net46" />
+    <file src=".\Build\Release\PetaJson\net46\PetaJson.*" target="runtimes/any/lib/net46" />
 
   </files>
 </package>

+ 1 - 1
PetaJson/PetaJson.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\Build\$(Configuration)\$(MSBuildProjectName)</OutputPath>

+ 1 - 1
build.js

@@ -31,7 +31,7 @@ if (release)
 
 	bt.signfile([
         "Build\\Release\\PetaJson\\netcoreapp2.0\\PetaJson.dll",
-        "Build\\Release\\PetaJson\\net461\\PetaJson.dll",
+        "Build\\Release\\PetaJson\\net46\\PetaJson.dll",
 
     ], "PetaJson JSON Serialization Library");
 

+ 3 - 3
version.cs

@@ -3,13 +3,13 @@
 using System;
 using System.Reflection;
 [assembly: AssemblyCopyright("Copyright © 2014-2018 Topten Software. All Rights Reserved")]
-[assembly: AssemblyVersion("1.1.107")]
-[assembly: AssemblyFileVersion("1.1.107")]
+[assembly: AssemblyVersion("1.1.109")]
+[assembly: AssemblyFileVersion("1.1.109")]
 [assembly: AssemblyCompany("Topten Software")]
 [assembly: AssemblyProduct("PetaJson")]
 
 static class BuildInfo
 {
-	public static DateTime Date = new DateTime(2018, 10, 20, 1, 29, 21, DateTimeKind.Utc);
+	public static DateTime Date = new DateTime(2018, 10, 22, 22, 37, 53, DateTimeKind.Utc);
 }
 	

+ 1 - 1
version.h

@@ -1,7 +1,7 @@
 
 #define VER_A		1
 #define VER_B		1
-#define VER_C		107
+#define VER_C		109
 #define VER_D		0
 #define COPYRIGHT_STRING "Copyright © 2014-2018 Topten Software. All Rights Reserved\0"
 	

+ 1 - 1
version.json

@@ -1,7 +1,7 @@
 {
     "major": 1,
     "minor": 1,
-    "build": 107,
+    "build": 109,
     "copyrightYear": 2014,
     "productName": "PetaJson"
 }

+ 1 - 1
version.props

@@ -2,7 +2,7 @@
 <!-- Generated by build tool, do not edit -->
 <Project>
   <PropertyGroup>
-  	<Version Condition="'$(Variable)' == ''">1.1.107</Version>
+  	<Version Condition="'$(Variable)' == ''">1.1.109</Version>
   </PropertyGroup>
 </Project>