KWD 7 miesięcy temu
rodzic
commit
edc062c289
2 zmienionych plików z 8 dodań i 11 usunięć
  1. 8 8
      TeamAAS-VM.sln
  2. 0 3
      TeamAAS-VM/TeamAAS-VP.csproj

+ 8 - 8
TeamAAS-VM.sln

@@ -1,26 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34714.143
+# Visual Studio Version 18
+VisualStudioVersion = 18.2.11415.280
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamAAS-VP", "TeamAAS-VM\TeamAAS-VP.csproj", "{08877F07-4A1C-4530-9105-CF24945AF83C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Team.FFFeederService", "Team.FFFeederService\Team.FFFeederService.csproj", "{26DA3704-77D7-46A7-8651-684878DAC898}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamAAS-VP", "TeamAAS-VM\TeamAAS-VP.csproj", "{08877F07-4A1C-4530-9105-CF24945AF83C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08877F07-4A1C-4530-9105-CF24945AF83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08877F07-4A1C-4530-9105-CF24945AF83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08877F07-4A1C-4530-9105-CF24945AF83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08877F07-4A1C-4530-9105-CF24945AF83C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{26DA3704-77D7-46A7-8651-684878DAC898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26DA3704-77D7-46A7-8651-684878DAC898}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26DA3704-77D7-46A7-8651-684878DAC898}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26DA3704-77D7-46A7-8651-684878DAC898}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08877F07-4A1C-4530-9105-CF24945AF83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08877F07-4A1C-4530-9105-CF24945AF83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08877F07-4A1C-4530-9105-CF24945AF83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08877F07-4A1C-4530-9105-CF24945AF83C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 0 - 3
TeamAAS-VM/TeamAAS-VP.csproj

@@ -541,11 +541,8 @@
     <Compile Include="Models\DeviceInfo.cs" />
     <Compile Include="Models\Feeder\ScrewFeederInfo.cs" />
     <Compile Include="Models\PhotoCaptureRecord.cs" />
-<<<<<<< HEAD
     <Compile Include="Models\ScanRs232ConfigModel.cs" />
-=======
     <Compile Include="Models\PressureModel.cs" />
->>>>>>> 24cf64d4a0ed8eeeacf0f6455ca76b15114dc235
     <Compile Include="Models\ScrewFeederBatchRecord.cs" />
     <Compile Include="Services\MesService.cs" />
     <Compile Include="ValueConverter\CountToColumnsConverter.cs" />