From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/.vs/GateWay/xs/project-cache/ShardLib-Debug.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/project-cache/ShardLib-Debug.json b/ZigbeeApp/.vs/GateWay/xs/project-cache/ShardLib-Debug.json
index d2dc6ee..364bc7b 100644
--- a/ZigbeeApp/.vs/GateWay/xs/project-cache/ShardLib-Debug.json
+++ b/ZigbeeApp/.vs/GateWay/xs/project-cache/ShardLib-Debug.json
@@ -1 +1 @@
-{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v9.0/Mono.Android.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Xml.dll","Aliases":[]}],"Files":["/Users/hdl/Desktop/git/HomeApp/ZigbeeApp/ShardLib/Properties/AssemblyInfo.cs","/Users/hdl/Desktop/git/HomeApp/ZigbeeApp/ShardLib/Additions/AboutAdditions.txt","/Users/hdl/Desktop/git/HomeApp/ZigbeeApp/ShardLib/Jars/AboutJars.txt","/Users/hdl/Desktop/git/HomeApp/ZigbeeApp/ShardLib/Transforms/EnumFields.xml","/Users/hdl/Desktop/git/HomeApp/ZigbeeApp/ShardLib/Transforms/EnumMethods.xml","/Users/hdl/Desktop/git/HomeApp/ZigbeeApp/ShardLib/Transforms/Metadata.xml"],"BuildActions":["Compile","None","None","TransformFile","TransformFile","TransformFile"],"Analyzers":[]}
\ No newline at end of file
+{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v9.0/Mono.Android.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.3.0-23/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Xml.dll","Aliases":[]}],"Files":["/Users/hdl/Desktop/HomeApp/ZigbeeApp/ShardLib/Properties/AssemblyInfo.cs","/Users/hdl/Desktop/HomeApp/ZigbeeApp/ShardLib/Additions/AboutAdditions.txt","/Users/hdl/Desktop/HomeApp/ZigbeeApp/ShardLib/Jars/AboutJars.txt","/Users/hdl/Desktop/HomeApp/ZigbeeApp/ShardLib/Transforms/EnumFields.xml","/Users/hdl/Desktop/HomeApp/ZigbeeApp/ShardLib/Transforms/EnumMethods.xml","/Users/hdl/Desktop/HomeApp/ZigbeeApp/ShardLib/Transforms/Metadata.xml"],"BuildActions":["Compile","None","None","TransformFile","TransformFile","TransformFile"],"Analyzers":[]}

--
Gitblit v1.8.0