Skip to content

Commit

Permalink
Updated to VS2022. Updated gtest and dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
abdulkareem-siddiq committed Nov 20, 2021
1 parent 11cfd20 commit 664b931
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 25 deletions.
2 changes: 0 additions & 2 deletions AzureCppUtils.sln
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
LICENSE = LICENSE
README.md = README.md
SECURITY.md = SECURITY.md
vcpkg.json = vcpkg.json
vcpkg_response.txt = vcpkg_response.txt
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_tests", "tests\basic_tests.vcxproj", "{025C9280-6302-401E-949F-F82DF4D47204}"
Expand Down
2 changes: 1 addition & 1 deletion nuget/SiddiqSoft.AzureCppUtils.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<copyright>Copyright (c) 2021 Siddiq Software LLC</copyright>
<!-- Dependencies -->
<dependencies>
<dependency id="SiddiqSoft.RunOnEnd" version="1.2.0"/>
<dependency id="SiddiqSoft.RunOnEnd" version="1.2"/>
</dependencies>
</metadata>

Expand Down
13 changes: 9 additions & 4 deletions tests/basic_tests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgUseStatic>true</VcpkgUseStatic>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnabled>false</VcpkgEnabled>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="test.cpp" />
</ItemGroup>
Expand All @@ -60,7 +63,8 @@
<ItemDefinitionGroup />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\SiddiqSoft.RunOnEnd.1.2.0\build\native\SiddiqSoft.RunOnEnd.targets" Condition="Exists('..\packages\SiddiqSoft.RunOnEnd.1.2.0\build\native\SiddiqSoft.RunOnEnd.targets')" />
<Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
<Import Project="..\packages\SiddiqSoft.RunOnEnd.1.2.1\build\native\SiddiqSoft.RunOnEnd.targets" Condition="Exists('..\packages\SiddiqSoft.RunOnEnd.1.2.1\build\native\SiddiqSoft.RunOnEnd.targets')" />
</ImportGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -84,7 +88,7 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<OutputFile />
Expand Down Expand Up @@ -113,7 +117,7 @@
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<OutputFile />
Expand All @@ -123,6 +127,7 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\SiddiqSoft.RunOnEnd.1.2.0\build\native\SiddiqSoft.RunOnEnd.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SiddiqSoft.RunOnEnd.1.2.0\build\native\SiddiqSoft.RunOnEnd.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
<Error Condition="!Exists('..\packages\SiddiqSoft.RunOnEnd.1.2.1\build\native\SiddiqSoft.RunOnEnd.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SiddiqSoft.RunOnEnd.1.2.1\build\native\SiddiqSoft.RunOnEnd.targets'))" />
</Target>
</Project>
3 changes: 2 additions & 1 deletion tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SiddiqSoft.RunOnEnd" version="1.2.0" targetFramework="native" />
<package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.5" targetFramework="native" />
<package id="SiddiqSoft.RunOnEnd" version="1.2.1" targetFramework="native" />
</packages>
1 change: 0 additions & 1 deletion tests/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

#include "../src/azure-cpp-utils.hpp"


namespace siddiqsoft
{
TEST(Base64Utils, test1a)
Expand Down
13 changes: 0 additions & 13 deletions vcpkg.json

This file was deleted.

3 changes: 0 additions & 3 deletions vcpkg_response.txt

This file was deleted.

0 comments on commit 664b931

Please sign in to comment.