minor config fixes [skip ci]

marzer · May 19, 2021 · 9c59810 · 9c59810
1 parent 1baad21
commit 9c59810
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.runsettings b/.runsettings
@@ -3,7 +3,7 @@
    <!-- Configurations that affect the Test Framework -->
    <RunConfiguration>
        <MaxCpuCount>0</MaxCpuCount>
-       <ResultsDirectory>..\build\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
+       <ResultsDirectory>build\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
        <TestSessionTimeout>60000</TestSessionTimeout><!-- Milliseconds -->
    </RunConfiguration>
 
@@ -13,7 +13,7 @@
        <DiscoverTimeout>500</DiscoverTimeout><!-- Milliseconds -->
 	   <FilenameFilter>(?i:test)</FilenameFilter>
        <WorkingDirectoryRoot>Solution</WorkingDirectoryRoot>
-       <WorkingDirectory>..\tests\</WorkingDirectory>
+       <WorkingDirectory>tests\</WorkingDirectory>
 	   <MessageFormat>AdditionalInfo</MessageFormat>
    </Catch2Adapter>
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13...3.19)
 
-project(tomlplusplus LANGUAGES CXX VERSION 2.3.1)
+project(tomlplusplus LANGUAGES CXX VERSION 2.4.0)
 
 # Determine if this project is built as a subproject (using
 # add_subdirectory) or if it is the master project.

diff --git a/toml++.vcxproj b/toml++.vcxproj
@@ -68,6 +68,7 @@
     <None Include=".editorconfig" />
     <None Include=".gitattributes" />
     <None Include=".gitignore" />
+    <None Include=".runsettings" />
     <None Include="CODE_OF_CONDUCT.md" />
     <None Include="CONTRIBUTING.md" />
     <None Include="cpp.hint" />
@@ -87,6 +88,7 @@
     <Natvis Include="toml++.natvis" />
   </ItemGroup>
   <ItemGroup>
+    <Text Include="CMakeLists.txt" />
     <Text Include="meson_options.txt" />
     <Text Include="tools\requirements.txt" />
   </ItemGroup>

diff --git a/toml++.vcxproj.filters b/toml++.vcxproj.filters
@@ -118,6 +118,7 @@
     <None Include="docs\poxy.toml">
       <Filter>docs</Filter>
     </None>
+    <None Include=".runsettings" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include=".circleci">
@@ -144,5 +145,6 @@
     <Text Include="tools\requirements.txt">
       <Filter>tools</Filter>
     </Text>
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>