#19: Fix up build with dotnet/msvc2015

jumpinjackie · Jun 16, 2017 · 0de5097 · 0de5097
1 parent ab8ff80
commit 0de5097
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 323 deletions.
diff --git a/build.cmd b/build.cmd
@@ -12,9 +12,9 @@ msbuild /p:Configuration=%MG_CONFIG%;Platform=x64 Bindings.sln
 if errorlevel 1 goto error
 popd
 pushd src\Bindings\DotNet\MapGuideDotNetApi
-call dnu restore
+call dotnet restore
 if errorlevel 1 goto error
-call dnu pack --configuration Release
+call dotnet pack --configuration Release
 if errorlevel 1 goto error
 popd
 goto end

diff --git a/envsetupsdk.cmd b/envsetupsdk.cmd
@@ -29,17 +29,17 @@ SET MG_SDK_LIB64=../../../%MG_SDK_DIR%/Lib64
 
 REM restore nuget packages just in case
 pushd src\Tools
-call dnu restore
+call dotnet restore
 popd
 
 echo Preparing SWIG configurations
 pushd src\Tools\SwigPrepare
-call dnx run ..\..\..\sdk\%MG_VERSION% ..\..\Bindings\MapGuideApi
+call dotnet run ..\..\..\sdk\%MG_VERSION% ..\..\Bindings\MapGuideApi
 popd
 
 echo Stamping version [%MG_VER_MAJOR%.%MG_VER_MINOR%.%MG_VER_REV%.%MG_VER_BUILD%]
 pushd src\Tools\StampVer
-call dnx run ..\.. %MG_VER_MAJOR% %MG_VER_MINOR% %MG_VER_REV% %MG_VER_BUILD%
+call dotnet run ..\.. %MG_VER_MAJOR% %MG_VER_MINOR% %MG_VER_REV% %MG_VER_BUILD%
 popd
 
 echo Preparing native binaries for nuget package

diff --git a/src/Bindings/Bindings.sln b/src/Bindings/Bindings.sln
@@ -18,86 +18,53 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{99132700
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_VC11|Any CPU = Debug_VC11|Any CPU
 		Debug_VC11|x64 = Debug_VC11|x64
 		Debug_VC11|x86 = Debug_VC11|x86
-		Debug_VC14|Any CPU = Debug_VC14|Any CPU
 		Debug_VC14|x64 = Debug_VC14|x64
 		Debug_VC14|x86 = Debug_VC14|x86
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release_VC11|Any CPU = Release_VC11|Any CPU
 		Release_VC11|x64 = Release_VC11|x64
 		Release_VC11|x86 = Release_VC11|x86
-		Release_VC14|Any CPU = Release_VC14|Any CPU
 		Release_VC14|x64 = Release_VC14|x64
 		Release_VC14|x86 = Release_VC14|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|Any CPU.ActiveCfg = Debug_VC11|Win32
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x64.ActiveCfg = Debug_VC11|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x64.Build.0 = Debug_VC11|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x86.ActiveCfg = Debug_VC11|Win32
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x86.Build.0 = Debug_VC11|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|Any CPU.ActiveCfg = Debug_VC14|Win32
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x64.ActiveCfg = Debug_VC14|x64
+		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x64.Build.0 = Debug_VC14|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x86.ActiveCfg = Debug_VC14|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.ActiveCfg = Debug|x64
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.Build.0 = Debug|x64
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x86.ActiveCfg = Debug|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x86.Build.0 = Debug|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|Any CPU.ActiveCfg = Release_VC11|Win32
+		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x86.Build.0 = Debug_VC14|Win32
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x64.ActiveCfg = Release_VC11|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x64.Build.0 = Release_VC11|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x86.ActiveCfg = Release_VC11|Win32
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x86.Build.0 = Release_VC11|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|Any CPU.ActiveCfg = Release_VC14|Win32
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x64.ActiveCfg = Release_VC14|x64
+		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x64.Build.0 = Release_VC14|x64
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x86.ActiveCfg = Release_VC14|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.ActiveCfg = Release|x64
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.Build.0 = Release|x64
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x86.ActiveCfg = Release|Win32
-		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x86.Build.0 = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|Any CPU.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|Any CPU.Build.0 = Release|Win32
+		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x86.Build.0 = Release_VC14|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x64.ActiveCfg = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x64.Build.0 = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x64.Deploy.0 = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x86.ActiveCfg = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x86.Build.0 = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|Any CPU.ActiveCfg = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|Any CPU.Build.0 = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|Any CPU.Deploy.0 = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x64.ActiveCfg = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x64.Build.0 = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x64.Deploy.0 = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x86.ActiveCfg = Debug|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x86.Build.0 = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x86.ActiveCfg = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x86.Build.0 = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|Any CPU.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|Any CPU.Build.0 = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x64.ActiveCfg = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x64.Build.0 = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x64.Deploy.0 = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x86.ActiveCfg = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x86.Build.0 = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|Any CPU.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.ActiveCfg = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.Build.0 = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.Deploy.0 = Debug|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.ActiveCfg = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.Build.0 = Release|Win32
+		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.Deploy.0 = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x86.ActiveCfg = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x86.Build.0 = Release|Win32
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x86.Deploy.0 = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x86.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE