Merge branch 'OTSsteelmineralsystem' of http://36.129.163.148:30080/gogsadmin/OTS into OTSsteelmineralsystem

OTS.sln

@@ -745,8 +745,8 @@ Global
 		{A60440F1-FC94-4802-BFCB-E96457830D50}.Debug|x86.Build.0 = Debug|Any CPU
 		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|Any CPU.ActiveCfg = Release|Any CPU
 		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|Any CPU.Build.0 = Release|Any CPU
-		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|x64.ActiveCfg = Release|x64
-		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|x64.Build.0 = Release|x64
+		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64
+		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|x64.Build.0 = Release_oxford50|x64
 		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|x86.ActiveCfg = Release|Any CPU
 		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford50|x86.Build.0 = Release|Any CPU
 		{A60440F1-FC94-4802-BFCB-E96457830D50}.Release_oxford60|Any CPU.ActiveCfg = Release|Any CPU

SpectrumSTDEditor/SpectrumSTDEditor.csproj

@@ -43,7 +43,67 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>..\bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|AnyCPU'">
+    <OutputPath>bin\Release_oxford50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
+    <OutputPath>..\bin\x64\Release_oxford50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford61|AnyCPU'">
+    <OutputPath>bin\Release_oxford61\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford61|x64'">
+    <OutputPath>bin\x64\Release_oxford61\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford61sp1|AnyCPU'">
+    <OutputPath>bin\Release_oxford61sp1\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford61sp1|x64'">
+    <OutputPath>bin\x64\Release_oxford61sp1\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>