Skip to content

Commit ae8e931

Browse files
committed
Upgrade to 3.2704.1418
Remove $(SolutionDir) and revert to relative path (Nuget keeps changing it when we upgrade and it's annoying to manually edit those files for something that's not required for the core project to work)o
1 parent 2d72e1f commit ae8e931

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(SolutionDir)\packages\cef.sdk.3.2704.1415\build\cef.sdk.props" Condition="Exists('$(SolutionDir)\packages\cef.sdk.3.2704.1415\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
6767
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6868
</ImportGroup>
6969
<PropertyGroup Label="UserMacros">
70-
<NuGetPackageImportStamp>fc074e93</NuGetPackageImportStamp>
70+
<NuGetPackageImportStamp>e9271c37</NuGetPackageImportStamp>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7373
<LinkIncremental>true</LinkIncremental>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="3.2704.1415" targetFramework="Native" />
3+
<package id="cef.sdk" version="3.2704.1418" targetFramework="Native" />
44
</packages>

CefSharp.Core/CefSharp.Core.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(SolutionDir)\packages\cef.sdk.3.2704.1415\build\cef.sdk.props" Condition="Exists('$(SolutionDir)\packages\cef.sdk.3.2704.1415\build\cef.sdk.props')" />
3+
<Import Project="..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2704.1418\build\cef.sdk.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
6767
<PropertyGroup Label="UserMacros" />
6868
<PropertyGroup>
6969
<_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
70-
<NuGetPackageImportStamp>cbd1cef5</NuGetPackageImportStamp>
70+
<NuGetPackageImportStamp>2ebb2af2</NuGetPackageImportStamp>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7373
<OutDir>bin\$(Platform)\$(Configuration)\</OutDir>

CefSharp.Core/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.sdk" version="3.2704.1415" targetFramework="Native" />
3+
<package id="cef.sdk" version="3.2704.1418" targetFramework="Native" />
44
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
16-
<NuGetPackageImportStamp>cd16b402</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>f7c3e354</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
1919
<DebugSymbols>true</DebugSymbols>
@@ -90,6 +90,6 @@
9090
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9191
<Import Project="$(SolutionDir)\CefSharp.props" />
9292
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
93-
<Import Project="..\packages\cef.redist.x64.3.2704.1415\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1415\build\cef.redist.x64.targets')" />
94-
<Import Project="..\packages\cef.redist.x86.3.2704.1415\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1415\build\cef.redist.x86.targets')" />
93+
<Import Project="..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets')" />
94+
<Import Project="..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets')" />
9595
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist.x64" version="3.2704.1415" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="3.2704.1415" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="3.2704.1418" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="3.2704.1418" targetFramework="net452" />
55
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<OldToolsVersion>3.5</OldToolsVersion>
2222
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
2323
<TargetFrameworkProfile />
24-
<NuGetPackageImportStamp>0e6bf975</NuGetPackageImportStamp>
24+
<NuGetPackageImportStamp>b35484a6</NuGetPackageImportStamp>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
2727
<PlatformTarget>x64</PlatformTarget>
@@ -182,6 +182,6 @@
182182
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
183183
<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')" />
184184
<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')" />
185-
<Import Project="..\packages\cef.redist.x64.3.2704.1415\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1415\build\cef.redist.x64.targets')" />
186-
<Import Project="..\packages\cef.redist.x86.3.2704.1415\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1415\build\cef.redist.x86.targets')" />
185+
<Import Project="..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets')" />
186+
<Import Project="..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets')" />
187187
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist.x64" version="3.2704.1415" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="3.2704.1415" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="3.2704.1418" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="3.2704.1418" targetFramework="net452" />
55
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<OldToolsVersion>3.5</OldToolsVersion>
2222
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
2323
<TargetFrameworkProfile />
24-
<NuGetPackageImportStamp>a25ab937</NuGetPackageImportStamp>
24+
<NuGetPackageImportStamp>e08d0872</NuGetPackageImportStamp>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
2727
<DebugSymbols>true</DebugSymbols>
@@ -180,6 +180,6 @@
180180
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
181181
<Import Project="$(SolutionDir)\CefSharp.props" />
182182
<Import Project="$(SolutionDir)\CefSharp.Native.props" />
183-
<Import Project="..\packages\cef.redist.x64.3.2704.1415\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1415\build\cef.redist.x64.targets')" />
184-
<Import Project="..\packages\cef.redist.x86.3.2704.1415\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1415\build\cef.redist.x86.targets')" />
183+
<Import Project="..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2704.1418\build\cef.redist.x64.targets')" />
184+
<Import Project="..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2704.1418\build\cef.redist.x86.targets')" />
185185
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist.x64" version="3.2704.1415" targetFramework="net452" />
4-
<package id="cef.redist.x86" version="3.2704.1415" targetFramework="net452" />
3+
<package id="cef.redist.x64" version="3.2704.1418" targetFramework="net452" />
4+
<package id="cef.redist.x86" version="3.2704.1418" targetFramework="net452" />
55
<package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
66
<package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net45" />
77
</packages>

0 commit comments

Comments
 (0)