Skip to content

Commit 8951549

Browse files
committed
Preparations for 2.7 release
1. Fix build failure 140 UWP project file 2. Update the version numbers to 2.7 in the appropriate places
1 parent c7198d0 commit 8951549

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

Build/version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<CppRestBaseFileName>cpprest</CppRestBaseFileName>
55
<CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
6-
<CppRestSDKVersionMinor>6</CppRestSDKVersionMinor>
6+
<CppRestSDKVersionMinor>7</CppRestSDKVersionMinor>
77
<CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
88
<CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
99
<CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>

Release/include/cpprest/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* ==--==
1717
*/
1818
#define CPPREST_VERSION_REVISION 0
19-
#define CPPREST_VERSION_MINOR 6
19+
#define CPPREST_VERSION_MINOR 7
2020
#define CPPREST_VERSION_MAJOR 2
2121

2222
#define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)

Release/src/build/init.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Copy-Natvis($DestFolder)
55
if ((Test-Path $DestFolder) -eq $True)
66
{
77
# Update casablanca version for each release here.
8-
$DestFile = Join-Path -path $DestFolder -childpath "cpprest2_5.natvis";
8+
$DestFile = Join-Path -path $DestFolder -childpath "cpprest2_7.natvis";
99

1010
# Check to see if cpp rest natvis file for this version already exists
1111
# if not, then copy into user profile for Visual Studio to pick up

Release/src/build/vs14.uwp/cpprestsdk140.uwp.vcxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@
3434
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3535
<AppContainerApplication>true</AppContainerApplication>
3636
<ApplicationType>Windows Store</ApplicationType>
37-
<ApplicationTypeRevision>8.2</ApplicationTypeRevision>
38-
<ProjectName>cpprestsdk140.uwp</ProjectName>
39-
<PlatformToolset>v140</PlatformToolset>
40-
<ConfigurationType>DynamicLibrary</ConfigurationType>
41-
<OutDir>$(OutDir)\$(MsBuildProjectName)</OutDir>
37+
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
38+
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
39+
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
40+
<ProjectName>cpprestsdk140.uwp</ProjectName>
41+
<PlatformToolset>v140</PlatformToolset>
42+
<ConfigurationType>DynamicLibrary</ConfigurationType>
43+
<OutDir>$(OutDir)\$(MsBuildProjectName)</OutDir>
4244
</PropertyGroup>
4345
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4446
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)