Merge branch 'master' of http://app.puruiit.cn:9092/luozhipeng/ModelList

ButtonModel/BurronModel/BurronModel.csproj

@@ -64,18 +64,6 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestModel\ModelFrom.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TestModel\ModelFrom.Designer.cs">
-      <DependentUpon>ModelFrom.cs</DependentUpon>
-    </Compile>
-    <Compile Include="TestModel\SlowSpecRecord.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TestModel\SlowSpecRecord.Designer.cs">
-      <DependentUpon>SlowSpecRecord.cs</DependentUpon>
-    </Compile>
     <EmbeddedResource Include="ButtonFrom.resx">
       <DependentUpon>ButtonFrom.cs</DependentUpon>
     </EmbeddedResource>
@@ -91,12 +79,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="TestModel\ModelFrom.resx">
-      <DependentUpon>ModelFrom.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TestModel\SlowSpecRecord.resx">
-      <DependentUpon>SlowSpecRecord.cs</DependentUpon>
-    </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

ButtonModel/BurronModel/Program.cs

@@ -1,5 +1,4 @@
 using BurronModel.JsonToTable;
-using BurronModel.TestModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;

ButtonModel/BurronModel/obj/Debug/BurronModel.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ea984bc0e1f7ad277d5a025e1f09b51e8a0f9ed6
+fd058ed91d6a91cc4b5aebbdb49e297c31ea74e3

ButtonModel/BurronModel/obj/Debug/BurronModel.csproj.FileListAbsolute.txt

@@ -26,3 +26,17 @@ E:\WORK\CDPR\ButtonModel\BurronModel\obj\Debug\BurronModel.exe
 E:\WORK\CDPR\ButtonModel\BurronModel\obj\Debug\BurronModel.pdb
 E:\WORK\CDPR\ButtonModel\BurronModel\obj\Debug\BurronModel.JsonToTable.ToTableForm.resources
 E:\WORK\CDPR\ButtonModel\BurronModel\obj\Debug\BurronModel.csproj.AssemblyReference.cache
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.csproj.AssemblyReference.cache
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.exe
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.pdb
+F:\test\ModelList\ButtonModel\BurronModel\bin\Debug\BurronModel.exe.config
+F:\test\ModelList\ButtonModel\BurronModel\bin\Debug\BurronModel.exe
+F:\test\ModelList\ButtonModel\BurronModel\bin\Debug\BurronModel.pdb
+F:\test\ModelList\ButtonModel\BurronModel\bin\Debug\Newtonsoft.Json.dll
+F:\test\ModelList\ButtonModel\BurronModel\bin\Debug\Newtonsoft.Json.xml
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.ButtonFrom.resources
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.JsonToTable.ToTableForm.resources
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.Properties.Resources.resources
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.csproj.GenerateResource.cache
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.csproj.CoreCompileInputs.cache
+F:\test\ModelList\ButtonModel\BurronModel\obj\Debug\BurronModel.csproj.CopyComplete