Skip to content

Commit

Permalink
Merge pull request JavascriptNet#26 from BrisingrAerowing/master
Browse files Browse the repository at this point in the history
Added .NET 4.5.2 support to build scripts
  • Loading branch information
oliverbock committed Jul 13, 2015
2 parents 5f25d90 + a697759 commit 15891e4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,8 @@ Known Problems
==============

See Issues on GitHub.

Using .NET 4.5.2
=================

You will need the [.NET 4.5.2 Developer Pack](https://www.microsoft.com/en-us/download/details.aspx?id=42637) to build using .NET 4.5.2
2 changes: 1 addition & 1 deletion build_both.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ EXIT /b 0
ECHO VS_version: vs2010 ^| vs2012 ^| vs2013
ECHO MSVC_version: MSVC2010 ^| MSVC2012 ^| MSVC2013
ECHO Build_mode: Debug ^| Release
ECHO Framework_version: 4.0 ^| 4.5 ^| 4.5.1
ECHO Framework_version: 4.0 ^| 4.5 ^| 4.5.1 ^| 4.5.2
ECHO.
ECHO Note: see README if you have troubles building with MSVC different from your VS version (e.g. vs2013 and MSVC2010)
ENDLOCAL
Expand Down
7 changes: 6 additions & 1 deletion build_jsNet.bat
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ echo PlatformToolset is set to %PlatformToolset%
SET net40=4.0
SET net45=4.5
SET net451=4.5.1
SET net452=4.5.2
IF /I "%args-framework%"=="%net40%" (
SET TargetFrameworkVersion=v%net40%
SET TargetFrameworkProfile=Client
Expand All @@ -86,6 +87,10 @@ IF /I "%args-framework%"=="%net451%" (
SET TargetFrameworkVersion=v%net451%
SET TargetFrameworkProfile=
)
IF /I "%args-framework%"=="%net452%" (
SET TargetFrameworkVersion=v%net452%
SET TargetFrameworkProfile=
)
IF NOT DEFINED TargetFrameworkVersion GOTO :helpAndExit
echo TargetFrameworkVersion is set to %TargetFrameworkVersion%

Expand All @@ -105,7 +110,7 @@ EXIT /b 0
ECHO VS_version: vs2010 ^| vs2012 ^| vs2013
ECHO MSVC_version: MSVC2010 ^| MSVC2012 ^| MSVC2013
ECHO Build_mode: Debug ^| Release
ECHO Framework_version: 4.0 ^| 4.5 ^| 4.5.1
ECHO Framework_version: 4.0 ^| 4.5 ^| 4.5.1 ^| 4.5.2
ECHO.
ECHO Note: see README if you have troubles building with MSVC different from your VS version (e.g. vs2013 and MSVC2010)
ENDLOCAL
Expand Down

0 comments on commit 15891e4

Please sign in to comment.