Skip to content

Commit 60cb75c

Browse files
amaitlandamaitland
committed
Fix nuget package mistakes Examples Projects and Test project
Slightly modified packages and reused the same version number which caused some problems (Manually fixed package references)
1 parent 8978757 commit 60cb75c

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

‎CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props')" />
4+
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props')" />
35
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +15,7 @@
1315
<FileAlignment>512</FileAlignment>
1416
<TargetFrameworkProfile>
1517
</TargetFrameworkProfile>
16-
<NuGetPackageImportStamp>3a31868f</NuGetPackageImportStamp>
18+
<NuGetPackageImportStamp>79e9e151</NuGetPackageImportStamp>
1719
</PropertyGroup>
1820
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
1921
<DebugSymbols>true</DebugSymbols>
@@ -95,6 +97,4 @@
9597
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9698
<Import Project="$(SolutionDir)\CefSharp.props" />
9799
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
98-
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets')" />
99-
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets')" />
100100
</Project>

‎CefSharp.Test/CefSharp.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props')" />
4+
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props')" />
35
<Import Project="..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -20,7 +22,7 @@
2022
<OldToolsVersion>3.5</OldToolsVersion>
2123
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
2224
<TargetFrameworkProfile />
23-
<NuGetPackageImportStamp>10547b97</NuGetPackageImportStamp>
25+
<NuGetPackageImportStamp>e98a2691</NuGetPackageImportStamp>
2426
</PropertyGroup>
2527
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
2628
<DebugSymbols>true</DebugSymbols>
@@ -147,6 +149,4 @@
147149
-->
148150
<Import Project="$(SolutionDir)\CefSharp.props" />
149151
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
150-
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets')" />
151-
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets')" />
152152
</Project>

‎CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props')" />
4+
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props')" />
35
<PropertyGroup>
46
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
57
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,7 +23,7 @@
2123
<OldToolsVersion>3.5</OldToolsVersion>
2224
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
2325
<TargetFrameworkProfile />
24-
<NuGetPackageImportStamp>0319214d</NuGetPackageImportStamp>
26+
<NuGetPackageImportStamp>a438fa66</NuGetPackageImportStamp>
2527
</PropertyGroup>
2628
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
2729
<PlatformTarget>x64</PlatformTarget>
@@ -183,8 +185,4 @@
183185
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
184186
<Import Project="$(SolutionDir)\CefSharp.props" />
185187
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
186-
<Import Project="..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets')" />
187-
<Import Project="..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets')" />
188-
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets')" />
189-
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets')" />
190188
</Project>

‎CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.props')" />
4+
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.props')" />
35
<PropertyGroup>
46
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
57
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,7 +23,7 @@
2123
<OldToolsVersion>3.5</OldToolsVersion>
2224
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
2325
<TargetFrameworkProfile />
24-
<NuGetPackageImportStamp>dc6c87bd</NuGetPackageImportStamp>
26+
<NuGetPackageImportStamp>d288e865</NuGetPackageImportStamp>
2527
</PropertyGroup>
2628
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
2729
<DebugSymbols>true</DebugSymbols>
@@ -188,6 +190,4 @@
188190
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
189191
<Import Project="$(SolutionDir)\CefSharp.props" />
190192
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
191-
<Import Project="..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3239.1723\build\cef.redist.x64.targets')" />
192-
<Import Project="..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3239.1723\build\cef.redist.x86.targets')" />
193193
</Project>

0 commit comments

Comments
 (0)