Merge pull request #70 from nanoframework/release-v1.2.0

josesimoes · web-flow · commit 0dfdb56bd90b · 2019-04-23T12:28:46.000+01:00
diff --git a/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs b/source/nanoFramework.CoreLibrary/System/AssemblyInfo2.cs
@@ -14,4 +14,4 @@
 [assembly: AssemblyProduct("nanoFramework mscorlib")]
 [assembly: AssemblyCopyright("Copyright © nanoFramework Contributors 2017")]
 
-[assembly: AssemblyNativeVersion("1.1.1.")]
+[assembly: AssemblyNativeVersion("1.1.1.7")]
diff --git a/source/version.json b/source/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "assemblyVersion": {
     "precision": "revision"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"assemblyVersion": {`
`5`	`5`	`"precision": "revision"`
`6`	`6`	`},`