Skip to content
This repository was archived by the owner on Sep 3, 2021. It is now read-only.

Commit 7e1ebc4

Browse files
committed
Update .NET dependencies of MSIRGB.GUI project
1 parent 5c933d4 commit 7e1ebc4

File tree

3 files changed

+54
-12
lines changed

3 files changed

+54
-12
lines changed

MSIRGB.GUI/App.config

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-2.0.5.0" newVersion="2.0.5.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="Prism" publicKeyToken="40ee6c3a2184dc59" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-7.2.0.1422" newVersion="7.2.0.1422" />
15+
</dependentAssembly>
16+
</assemblyBinding>
17+
</runtime>
618
</configuration>

MSIRGB.GUI/MSIRGB.GUI.csproj

+36-8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3030
<UseApplicationTrust>false</UseApplicationTrust>
3131
<BootstrapperEnabled>true</BootstrapperEnabled>
32+
<NuGetPackageImportStamp>
33+
</NuGetPackageImportStamp>
3234
</PropertyGroup>
3335
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3436
<PlatformTarget>x64</PlatformTarget>
@@ -57,23 +59,49 @@
5759
<ApplicationIcon>Icon/AppIcon.ico</ApplicationIcon>
5860
</PropertyGroup>
5961
<ItemGroup>
60-
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
62+
<Reference Include="CommonServiceLocator, Version=2.0.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
63+
<HintPath>..\packages\CommonServiceLocator.2.0.5\lib\net46\CommonServiceLocator.dll</HintPath>
64+
</Reference>
65+
<Reference Include="Microsoft.Expression.Controls, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.Expression.Controls.dll</HintPath>
67+
</Reference>
68+
<Reference Include="Microsoft.Expression.Drawing, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.Expression.Drawing.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Microsoft.Expression.Effects, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.Expression.Effects.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
76+
</Reference>
77+
<Reference Include="Microsoft.Expression.Prototyping.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.Expression.Prototyping.Interactivity.dll</HintPath>
79+
</Reference>
80+
<Reference Include="Microsoft.Expression.Prototyping.SketchControls, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.Expression.Prototyping.SketchControls.dll</HintPath>
82+
</Reference>
83+
<Reference Include="Microsoft.SDK.Expression.Blend, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\Microsoft.SDK.Expression.Blend.dll</HintPath>
85+
</Reference>
6186
<Reference Include="PresentationFramework.Aero2" />
62-
<Reference Include="Prism, Version=7.1.0.431, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Prism.Core.7.1.0.431\lib\net45\Prism.dll</HintPath>
64-
<Private>True</Private>
87+
<Reference Include="Prism, Version=7.2.0.1422, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
88+
<HintPath>..\packages\Prism.Core.7.2.0.1422\lib\net45\Prism.dll</HintPath>
6589
</Reference>
66-
<Reference Include="Prism.Wpf, Version=7.1.0.431, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Prism.Wpf.7.1.0.431\lib\net45\Prism.Wpf.dll</HintPath>
90+
<Reference Include="Prism.Wpf, Version=7.2.0.1422, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
91+
<HintPath>..\packages\Prism.Wpf.7.2.0.1422\lib\net45\Prism.Wpf.dll</HintPath>
6892
</Reference>
6993
<Reference Include="System" />
94+
<Reference Include="System.Configuration" />
7095
<Reference Include="System.Data" />
7196
<Reference Include="System.Drawing" />
97+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
98+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
99+
</Reference>
72100
<Reference Include="System.Windows.Forms" />
101+
<Reference Include="System.Core" />
73102
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Prism.Wpf.7.1.0.431\lib\net45\System.Windows.Interactivity.dll</HintPath>
103+
<HintPath>..\packages\Prism.Wpf.7.2.0.1422\lib\net45\System.Windows.Interactivity.dll</HintPath>
75104
</Reference>
76-
<Reference Include="System.Core" />
77105
<Reference Include="System.Xaml">
78106
<RequiredTargetFramework>4.0</RequiredTargetFramework>
79107
</Reference>

MSIRGB.GUI/packages.config

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
4-
<package id="Prism.Core" version="7.1.0.431" targetFramework="net461" />
5-
<package id="Prism.Wpf" version="7.1.0.431" targetFramework="net461" />
3+
<package id="CommonServiceLocator" version="2.0.5" targetFramework="net461" />
4+
<package id="Microsoft.SDK.Expression.Blend" version="1.0.0" targetFramework="net461" />
5+
<package id="Prism.Core" version="7.2.0.1422" targetFramework="net461" />
6+
<package id="Prism.Wpf" version="7.2.0.1422" targetFramework="net461" />
7+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
68
</packages>

0 commit comments

Comments
 (0)