Browse Source

resolved version conflict issue.

sangwq 2 years ago
parent
commit
70d32eaa34

BIN
Venus/Framework/Output/MECF.Framework/Newtonsoft.Json.dll


BIN
Venus/ThirdParty/System.ValueTuple.dll


BIN
Venus/ThirdParty/System.Windows.Interactivity.dll


+ 5 - 2
Venus/Venus_MainPages/Venus_MainPages.csproj

@@ -38,6 +38,9 @@
     <Reference Include="ControlzEx">
       <HintPath>..\ThirdParty\ControlzEx.dll</HintPath>
     </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\ThirdParty\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="OpenSEMI.Core">
       <HintPath>..\ThirdParty\OpenSEMI.Core.dll</HintPath>
     </Reference>
@@ -61,8 +64,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
-    <Reference Include="System.ValueTuple" />
-    <Reference Include="System.Windows.Interactivity">
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xaml" />

BIN
Venus/Venus_RT/Resources/defaultrt.ico.ico


+ 4 - 5
Venus/Venus_RT/Venus_RT.csproj

@@ -34,6 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>defaultrt.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FabConnect">
       <HintPath>..\ThirdParty\FabConnect.dll</HintPath>
@@ -157,11 +160,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\defaultrt.ico.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <Page Include="Backends\FSM.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -178,6 +176,7 @@
     <Content Include="Config\_ioDefineVenus.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="defaultrt.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 8 - 2
Venus/Venus_UI/Venus_UI.csproj

@@ -54,6 +54,9 @@
     <Reference Include="CommonServiceLocator">
       <HintPath>..\ThirdParty\CommonServiceLocator.dll</HintPath>
     </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\ThirdParty\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="OpenSEMI.Core">
       <HintPath>..\ThirdParty\OpenSEMI.Core.dll</HintPath>
     </Reference>
@@ -76,8 +79,7 @@
       <HintPath>..\ThirdParty\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="System.Windows.Interactivity">
       <HintPath>..\ThirdParty\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
@@ -161,6 +163,10 @@
     <Folder Include="ViewModels\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Framework\Common\Common.csproj">
+      <Project>{9cd2a6be-1971-4e74-b49e-547982f64034}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\RecipeEditorControl\RecipeEditorControl.csproj">
       <Project>{c226e370-e9fb-48e7-bf40-89a33f88ef17}</Project>
       <Name>RecipeEditorControl</Name>