diff --git a/Cross-Platform/SignalGoTest.Desktop/SignalGoTest.Desktop.csproj b/Cross-Platform/SignalGoTest.Desktop/SignalGoTest.Desktop.csproj
index ca14d71..5776098 100644
--- a/Cross-Platform/SignalGoTest.Desktop/SignalGoTest.Desktop.csproj
+++ b/Cross-Platform/SignalGoTest.Desktop/SignalGoTest.Desktop.csproj
@@ -70,11 +70,15 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\SignalGo-full-net\SignalGo.Client\SignalGo.Client.csproj" />
     <ProjectReference Include="..\..\..\SignalGo-full-net\SignalGo.Shared\SignalGo.Shared.csproj" />
-    <ProjectReference Include="..\..\..\SignalGoAddServiceReference\SignalGo.CodeGenerator\SignalGo.CodeGenerator.csproj" />
     <ProjectReference Include="..\SignalGoTest.Models\SignalGoTest.Models.csproj" />
     <ProjectReference Include="..\SignalGoTest.ViewModels\SignalGoTest.ViewModels.csproj" />
     <ProjectReference Include="D:\Github\MVVMGo\MvvmGo\MvvmGo\MvvmGo.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="SignalGo.CodeGenerator">
+      <HintPath>..\..\..\SignalGoAddServiceReference\SignalGo.CodeGenerator\bin\Debug\netstandard2.0\SignalGo.CodeGenerator.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Views\AddNewView.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/Cross-Platform/SignalGoTest.ViewModels/SignalGoTest.ViewModels.csproj b/Cross-Platform/SignalGoTest.ViewModels/SignalGoTest.ViewModels.csproj
index b8276fb..763d674 100644
--- a/Cross-Platform/SignalGoTest.ViewModels/SignalGoTest.ViewModels.csproj
+++ b/Cross-Platform/SignalGoTest.ViewModels/SignalGoTest.ViewModels.csproj
@@ -9,11 +9,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\SignalGoAddServiceReference\SignalGo.CodeGenerator\SignalGo.CodeGenerator.csproj">
-      <Aliases>SignalGoCodeGenerator</Aliases>
-    </ProjectReference>
     <ProjectReference Include="..\SignalGoTest.Models\SignalGoTest.Models.csproj" />
     <ProjectReference Include="D:\Github\MVVMGo\MvvmGo\MvvmGo\MvvmGo.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="SignalGo.CodeGenerator">
+      <HintPath>..\..\..\SignalGoAddServiceReference\SignalGo.CodeGenerator\bin\Debug\netstandard2.0\SignalGo.CodeGenerator.dll</HintPath>
+      <Aliases>SignalGoCodeGenerator</Aliases>
+    </Reference>
+  </ItemGroup>
+
 </Project>
diff --git a/Cross-Platform/SignalGoTestPro.sln b/Cross-Platform/SignalGoTestPro.sln
index 05d9867..71892f5 100644
--- a/Cross-Platform/SignalGoTestPro.sln
+++ b/Cross-Platform/SignalGoTestPro.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalGo.Client", "D:\Signa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalGo.Shared", "D:\SignalGo\Github\SignalGo-full-net\SignalGo.Shared\SignalGo.Shared.csproj", "{4EF33042-BFDC-4507-9FCD-15621E572E7F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalGo.CodeGenerator", "..\..\SignalGoAddServiceReference\SignalGo.CodeGenerator\SignalGo.CodeGenerator.csproj", "{C6BE992F-BF02-4871-BA99-6CABED429DD6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -339,54 +337,6 @@ Global
 		{4EF33042-BFDC-4507-9FCD-15621E572E7F}.Release|x64.Build.0 = Release|Any CPU
 		{4EF33042-BFDC-4507-9FCD-15621E572E7F}.Release|x86.ActiveCfg = Release|Any CPU
 		{4EF33042-BFDC-4507-9FCD-15621E572E7F}.Release|x86.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|ARM.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|x64.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.AppStore|x86.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|x64.Build.0 = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Debug|x86.Build.0 = Debug|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|ARM.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|iPhone.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|x64.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|x64.Build.0 = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|x86.ActiveCfg = Release|Any CPU
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -398,7 +348,6 @@ Global
 		{3086B5CD-6DCE-4C21-9EE0-397906205D4E} = {D1E3BB4F-F610-4687-9D6A-B60F167BB8DE}
 		{DA4F99A9-69E4-48F1-8850-5298F7762AB9} = {D1E3BB4F-F610-4687-9D6A-B60F167BB8DE}
 		{4EF33042-BFDC-4507-9FCD-15621E572E7F} = {D1E3BB4F-F610-4687-9D6A-B60F167BB8DE}
-		{C6BE992F-BF02-4871-BA99-6CABED429DD6} = {D1E3BB4F-F610-4687-9D6A-B60F167BB8DE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {966188CC-4E87-4738-A75A-CA91BC0E95D3}