Menu
▾
▴
SF.net SVN: orm:[1546] trunk
|
From: <mcu...@us...> - 2014-07-09 23:23:50
|
Revision: 1546
http://sourceforge.net/p/orm/code/1546
Author: mcurland
Date: 2014-07-09 23:23:40 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
The recent changes from 4.0 to 12.0 as the default ToolsVersion for all project files (as part of the VS2013 work in [1533]) stopped the project files from loading in Visual Studio 2008. The ToolsVersion for all project files is now set to a fake tools version (12.34), and this version needs to match the corresponding tool requirements for each VS version.
To facilitate this, I've added a VSVer.bat to update the registry keys and set the TargetVisualStudioVersion for each VS release. The added version-specific batch files simply call VSVer (VS2008.bat runs VSVer 2008). These batch files need to be run from the corresponding 'Visual Studio 20xx Command Prompt' (opened as an Administrator) before launching a solutions in Visual Studio.
Note that the toolsversion setting was usually provided for a command-line build, effectively overriding the value in the .csproj file. Build batch files have been updated so that this is always the case. However, VS cannot be persuaded to pay attention to any similar tools version setting, and the placement of this attribute on the root element of .csproj file means that it cannot be macroized, so some creativity was required to allow a single project file to open in all versions of VS.
Modified Paths:
--------------
trunk/AlternateViews/BarkerERView/BarkerERView.csproj
trunk/AlternateViews/RelationalView/RelationalView.csproj
trunk/BuildAllVS2010.bat
trunk/BuildAllVS2013.bat
trunk/BuildDevToolsVS2010.bat
trunk/BuildDevToolsVS2013.bat
trunk/BuildSetupVS2010.bat
trunk/BuildSetupVS2013.bat
trunk/BuildVS2010.bat
trunk/BuildVS2013.bat
trunk/CustomProperties/CustomProperties.csproj
trunk/EntityRelationship/BarkerErModel/BarkerErModel.csproj
trunk/EntityRelationship/OialBerBridge/OialBerBridge.csproj
trunk/ExtensionExample/ExtensionExample.csproj
trunk/FirstTimeBuildAllVS2008.bat
trunk/FirstTimeBuildVS2010.bat
trunk/FirstTimeBuildVS2013.bat
trunk/OIALModel/OIALModel.csproj
trunk/ORMModel/ORMModel.csproj
trunk/Oial/ORMOialBridge/ORMOialBridge.csproj
trunk/Oial/OialModel/OialModel.csproj
trunk/README.txt
trunk/RelationalModel/DcilModel/DcilModel.csproj
trunk/RelationalModel/OialDcilBridge/OialDcilBridge.csproj
trunk/Tools/DatabaseImport/DatabaseImport.csproj
trunk/Tools/DisableRuleDirectiveProcessor/DisableRuleDirectiveProcessor.csproj
trunk/Tools/NUBuild/NUBuild.csproj
trunk/Tools/NUBuildVS/Install.bat
trunk/Tools/NUBuildVS/NUBuildVS.csproj
trunk/Tools/ORMCustomTool/ORMCustomTool.csproj
trunk/Tools/VersionGenerator/VersionGenerator.csproj
trunk/XML/GenerationSamples/GenerationSamples.csproj
Added Paths:
-----------
trunk/VS2005.bat
trunk/VS2008.bat
trunk/VS2010.bat
trunk/VS2012.bat
trunk/VS2013.bat
trunk/VSVer.bat
Modified: trunk/AlternateViews/BarkerERView/BarkerERView.csproj
===================================================================
--- trunk/AlternateViews/BarkerERView/BarkerERView.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/AlternateViews/BarkerERView/BarkerERView.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/AlternateViews/RelationalView/RelationalView.csproj
===================================================================
--- trunk/AlternateViews/RelationalView/RelationalView.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/AlternateViews/RelationalView/RelationalView.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/BuildAllVS2010.bat
===================================================================
--- trunk/BuildAllVS2010.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildAllVS2010.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -7,6 +7,7 @@
SET DegradeToolsVersion=/toolsversion:3.5
) ELSE (
SET TargetVisualStudioVersion=v10.0
+ SET DegradeToolsVersion=/toolsversion:4.0
)
CALL "%~dp0BuildAll.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
Modified: trunk/BuildAllVS2013.bat
===================================================================
--- trunk/BuildAllVS2013.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildAllVS2013.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -11,6 +11,7 @@
SET DegradeToolsVersion=/toolsversion:4.0
) ELSE (
SET TargetVisualStudioVersion=v12.0
+ SET DegradeToolsVersion=/toolsversion:12.0
)
CALL "%~dp0BuildAll.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
\ No newline at end of file
Modified: trunk/BuildDevToolsVS2010.bat
===================================================================
--- trunk/BuildDevToolsVS2010.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildDevToolsVS2010.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -7,6 +7,7 @@
SET DegradeToolsVersion=/toolsversion:3.5
) ELSE (
SET TargetVisualStudioVersion=v10.0
+ SET DegradeToolsVersion=/toolsversion:4.0
)
CALL "%~dp0BuildDevTools.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
\ No newline at end of file
Modified: trunk/BuildDevToolsVS2013.bat
===================================================================
--- trunk/BuildDevToolsVS2013.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildDevToolsVS2013.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -11,6 +11,7 @@
SET DegradeToolsVersion=/toolsversion:4.0
) ELSE (
SET TargetVisualStudioVersion=v12.0
+ SET DegradeToolsVersion=/toolsversion:12.0
)
CALL "%~dp0BuildDevTools.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
\ No newline at end of file
Modified: trunk/BuildSetupVS2010.bat
===================================================================
--- trunk/BuildSetupVS2010.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildSetupVS2010.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -7,6 +7,7 @@
SET DegradeToolsVersion=/toolsversion:3.5
) ELSE (
SET TargetVisualStudioVersion=v10.0
+ SET DegradeToolsVersion=/toolsversion:4.0
)
CALL "%~dp0BuildSetup.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
Modified: trunk/BuildSetupVS2013.bat
===================================================================
--- trunk/BuildSetupVS2013.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildSetupVS2013.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -11,6 +11,7 @@
SET DegradeToolsVersion=/toolsversion:4.0
) ELSE (
SET TargetVisualStudioVersion=v12.0
+ SET DegradeToolsVersion=/toolsversion:12.0
)
CALL "%~dp0BuildSetup.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
Modified: trunk/BuildVS2010.bat
===================================================================
--- trunk/BuildVS2010.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildVS2010.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -7,6 +7,7 @@
SET DegradeToolsVersion=/toolsversion:3.5
) ELSE (
SET TargetVisualStudioVersion=v10.0
+ SET DegradeToolsVersion=/toolsversion:4.0
)
CALL "%~dp0Build.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
\ No newline at end of file
Modified: trunk/BuildVS2013.bat
===================================================================
--- trunk/BuildVS2013.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/BuildVS2013.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -11,6 +11,7 @@
SET DegradeToolsVersion=/toolsversion:4.0
) ELSE (
SET TargetVisualStudioVersion=v12.0
+ SET DegradeToolsVersion=/toolsversion:12.0
)
CALL "%~dp0Build.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
\ No newline at end of file
Modified: trunk/CustomProperties/CustomProperties.csproj
===================================================================
--- trunk/CustomProperties/CustomProperties.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/CustomProperties/CustomProperties.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/EntityRelationship/BarkerErModel/BarkerErModel.csproj
===================================================================
--- trunk/EntityRelationship/BarkerErModel/BarkerErModel.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/EntityRelationship/BarkerErModel/BarkerErModel.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/EntityRelationship/OialBerBridge/OialBerBridge.csproj
===================================================================
--- trunk/EntityRelationship/OialBerBridge/OialBerBridge.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/EntityRelationship/OialBerBridge/OialBerBridge.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/ExtensionExample/ExtensionExample.csproj
===================================================================
--- trunk/ExtensionExample/ExtensionExample.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/ExtensionExample/ExtensionExample.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/FirstTimeBuildAllVS2008.bat
===================================================================
--- trunk/FirstTimeBuildAllVS2008.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/FirstTimeBuildAllVS2008.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -23,6 +23,7 @@
SET DegradeToolsVersion=/toolsversion:2.0
) ELSE (
SET TargetVisualStudioVersion=v9.0
+ SET DegradeToolsVersion=/toolsversion:3.5
)
CALL "%RootDir%\BuildDevTools.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
Modified: trunk/FirstTimeBuildVS2010.bat
===================================================================
--- trunk/FirstTimeBuildVS2010.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/FirstTimeBuildVS2010.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -8,6 +8,7 @@
SET DegradeToolsVersion=/toolsversion:3.5
) ELSE (
SET TargetVisualStudioVersion=v10.0
+ SET DegradeToolsVersion=/toolsversion:4.0
)
CALL "%RootDir%\BuildDevTools.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
Modified: trunk/FirstTimeBuildVS2013.bat
===================================================================
--- trunk/FirstTimeBuildVS2013.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/FirstTimeBuildVS2013.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -12,6 +12,7 @@
SET DegradeToolsVersion=/toolsversion:4.0
) ELSE (
SET TargetVisualStudioVersion=v12.0
+ SET DegradeToolsVersion=/toolsversion:12.0
)
CALL "%RootDir%\BuildDevTools.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%
Modified: trunk/OIALModel/OIALModel.csproj
===================================================================
--- trunk/OIALModel/OIALModel.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/OIALModel/OIALModel.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/ORMModel/ORMModel.csproj
===================================================================
--- trunk/ORMModel/ORMModel.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/ORMModel/ORMModel.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/Oial/ORMOialBridge/ORMOialBridge.csproj
===================================================================
--- trunk/Oial/ORMOialBridge/ORMOialBridge.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Oial/ORMOialBridge/ORMOialBridge.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/Oial/OialModel/OialModel.csproj
===================================================================
--- trunk/Oial/OialModel/OialModel.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Oial/OialModel/OialModel.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/README.txt 2014-07-09 23:23:40 UTC (rev 1546)
@@ -20,7 +20,7 @@
Download (Visual Studio 2010): http://www.microsoft.com/en-us/download/details.aspx?id=2680
Download (Visual Studio 2012): http://www.microsoft.com/en-us/download/details.aspx?id=30668
Download (Visual Studio 2013): http://www.microsoft.com/en-us/download/details.aspx?id=40758
-IMPORTANT: You will need to establish the Visual Studio experimental hive before building NORMA by running Visual Studio once in this environment. Use the link provided by the VS SDK, or run 'devenv.exe /RootSuffix Exp' from a Visual Studio command prompt.
+IMPORTANT: You will need to establish the Visual Studio experimental hive before building NORMA by running Visual Studio once in this environment. Use the link provided by the VS SDK, or run 'devenv.exe /RootSuffix Exp' from a Visual Studio command prompt. For Visual Studio 2008, make sure you use either the provided shortcut or add /RANU (run as normal user) to the command line. After running FirstTimeBuildVS2008.bat you should use 'devenv /rootsuffix Exp' instead of 'devenv /rootsuffix Exp /RANU'.
Microsoft Visual Studio Modeling and Visualization Tools (DSL Tools SDK), installs after the primary SDK
@@ -75,12 +75,13 @@
See the comments in SetupEnvironment.bat for additional details on how the options are used.
Notes on building and debugging with VS2008 through VS2013:
-The project files (.csproj, etc) are multitargeted to work correctly in Visual Studio 2005 and higher. However, the solution files (.sln) have slightly different formats in each VS version. If you open a VS2005 solution file in VS2008 then you will be prompted to upgrade. *.VS2008.sln files are provided as companions to all *.sln files for use in VS2008, and you will find corresponding .sln files for each successive version of VisualStudio. However, the *.VS2008.sln files are not sufficient for successfully building in VS2008.
+The project files (.csproj, etc) are multitargeted to work correctly in Visual Studio 2005 and higher. However, the solution files (.sln) have slightly different formats in each VS version. If you open a VS2005 solution file in VS2008 then you will be prompted to upgrade. *.VS2008.sln files are provided as companions to all *.sln files for use in VS2008, and you will find corresponding .sln files for each successive version of VisualStudio. However, the *.VS2008.sln files are not sufficient for successfully building in VS2008 (etc).
-You must set the TargetVisualStudioVersion to the correct version (listed above) before opening a NORMA project file from any of the Visual Studio IDE environments. The easiest way to do this is to (after the initial batch files mentioned above have completed successfully) is with the following steps. You may want to put these steps into an easily accessible batch file. The example given is for Visual Studio 2008, but 2010, 2012, and 2013 work similarly.
-1) Open a Visual Studio 2008 Command Prompt
-2) SET TargetVisualStudioVersion=v9.0
-3) Navigate to your NORMA root code directory
+You must set the TargetVisualStudioVersion to the correct version (listed above) before opening a NORMA project file from any of the Visual Studio IDE environments. There is also a registry that needs to be set so that the ToolsVersion setting the project files match the target environment. The easiest way to do this (after the initial batch files mentioned above have completed successfully) is with the following steps. You may want to put these steps into an easily accessible batch file. The example given is for Visual Studio 2008, but 2010, 2012, and 2013 work similarly.
+
+1) Open a Visual Studio 2008 Command Prompt (as an Administrator)
+2) Navigate to your NORMA root code directory
+3) Execute the VS2008.bat batch file in the command prompt. Each of these batch files (matching the VS20xx environment you're opening) do two things. First, it sets the TargetVisualStudioVersion variable to the appropriate value. Second, it updates the registry to copy the contents of the tools version matching your system to the tools version 12.34. All of the NORMA .csproj files use ToolsVersion="12.34" (a fake number), and modifying the contents of the corresponding registry key allows the same .csproj file to be used for all of the visual studio versions.
4) devenv ORMPackage.VS2008.sln
To build from the command line for VS2008:
Modified: trunk/RelationalModel/DcilModel/DcilModel.csproj
===================================================================
--- trunk/RelationalModel/DcilModel/DcilModel.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/RelationalModel/DcilModel/DcilModel.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/RelationalModel/OialDcilBridge/OialDcilBridge.csproj
===================================================================
--- trunk/RelationalModel/OialDcilBridge/OialDcilBridge.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/RelationalModel/OialDcilBridge/OialDcilBridge.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/Tools/DatabaseImport/DatabaseImport.csproj
===================================================================
--- trunk/Tools/DatabaseImport/DatabaseImport.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/DatabaseImport/DatabaseImport.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/Tools/DisableRuleDirectiveProcessor/DisableRuleDirectiveProcessor.csproj
===================================================================
--- trunk/Tools/DisableRuleDirectiveProcessor/DisableRuleDirectiveProcessor.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/DisableRuleDirectiveProcessor/DisableRuleDirectiveProcessor.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">DisableRuleDirectiveProcessor</Configuration>
Modified: trunk/Tools/NUBuild/NUBuild.csproj
===================================================================
--- trunk/Tools/NUBuild/NUBuild.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/NUBuild/NUBuild.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Load multi-targeting support directly to bootstrap the build process. -->
<Import Project="..\NUBuildVS\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
Modified: trunk/Tools/NUBuildVS/Install.bat
===================================================================
--- trunk/Tools/NUBuildVS/Install.bat 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/NUBuildVS/Install.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -16,15 +16,14 @@
gacutil.exe /nologo /f /i "%VsSDKVsctDir%\VSCTLibrary.dll"
gacutil.exe /nologo /f /i "%VsSDKVsctDir%\VSCT.exe"
-IF /I "%TargetVisualStudioVersion%"=="v10.0" (
+IF /I "%TargetVisualStudioVersion%"=="v8.0" (
+ CALL:VSCT_OLD
+) ELSE IF /I "%TargetVisualStudioVersion%"=="v9.0" (
+ CALL:VSCT_OLD
+) ELSE (
ngen.exe install "VSCTCompress, Version=%TargetVisualStudioAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
ngen.exe install "VSCTLibrary, Version=%TargetVisualStudioAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
ngen.exe install "VSCT, Version=%TargetVisualStudioAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
-) ELSE (
- :: As of the August 2007 release of the VsSDK, the VSCTCompress assembly is still versioned as 8.0.0.0.
- ngen.exe install "VSCTCompress, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
- ngen.exe install "VSCTLibrary, Version=%TargetVisualStudioAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
- ngen.exe install "VSCT, Version=%TargetVisualStudioFrameworkAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
)
@@ -42,3 +41,10 @@
:SETVAR
SET %~1=%~2
GOTO:EOF
+
+:VSCT_OLD
+:: As of the August 2007 release of the VsSDK, the VSCTCompress assembly is still versioned as 8.0.0.0.
+ngen.exe install "VSCTCompress, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
+ngen.exe install "VSCTLibrary, Version=%TargetVisualStudioAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
+ngen.exe install "VSCT, Version=%TargetVisualStudioFrameworkAssemblyVersion%, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /NoDependencies /nologo
+GOTO:EOF
\ No newline at end of file
Modified: trunk/Tools/NUBuildVS/NUBuildVS.csproj
===================================================================
--- trunk/Tools/NUBuildVS/NUBuildVS.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/NUBuildVS/NUBuildVS.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,7 +1,7 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!-- Load multi-targeting support directly to bootstrap the build process. -->
- <Import Project="Neumont.Build.VisualStudio.Multitargeting.targets" />
- <PropertyGroup>
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <!-- Load multi-targeting support directly to bootstrap the build process. -->
+ <Import Project="Neumont.Build.VisualStudio.Multitargeting.targets" />
+ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">NUBuildVS</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
Modified: trunk/Tools/ORMCustomTool/ORMCustomTool.csproj
===================================================================
--- trunk/Tools/ORMCustomTool/ORMCustomTool.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/ORMCustomTool/ORMCustomTool.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.Multitargeting.targets" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Modified: trunk/Tools/VersionGenerator/VersionGenerator.csproj
===================================================================
--- trunk/Tools/VersionGenerator/VersionGenerator.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/Tools/VersionGenerator/VersionGenerator.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">VersionGenerator</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Added: trunk/VS2005.bat
===================================================================
--- trunk/VS2005.bat (rev 0)
+++ trunk/VS2005.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -0,0 +1 @@
+@CALL "%~dp0VSVer.bat" 2005
Added: trunk/VS2008.bat
===================================================================
--- trunk/VS2008.bat (rev 0)
+++ trunk/VS2008.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -0,0 +1 @@
+@CALL "%~dp0VSVer.bat" 2008
Added: trunk/VS2010.bat
===================================================================
--- trunk/VS2010.bat (rev 0)
+++ trunk/VS2010.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -0,0 +1 @@
+@CALL "%~dp0VSVer.bat" 2010
Added: trunk/VS2012.bat
===================================================================
--- trunk/VS2012.bat (rev 0)
+++ trunk/VS2012.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -0,0 +1 @@
+@CALL "%~dp0VSVer.bat" 2012
Added: trunk/VS2013.bat
===================================================================
--- trunk/VS2013.bat (rev 0)
+++ trunk/VS2013.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -0,0 +1 @@
+@CALL "%~dp0VSVer.bat" 2013
Added: trunk/VSVer.bat
===================================================================
--- trunk/VSVer.bat (rev 0)
+++ trunk/VSVer.bat 2014-07-09 23:23:40 UTC (rev 1546)
@@ -0,0 +1,109 @@
+@ECHO OFF
+
+IF NOT "%~1"=="" (
+ CALL:_VER_%~1
+)
+
+::We want the TargetVisualStudioVersion to be available outside this batch
+::file, so establish it before calling SETLOCAL
+SETLOCAL
+IF "%ProgramFiles(X86)%"=="" (
+ SET WOWRegistryAdjust=
+) ELSE (
+ CALL:SET6432
+)
+SET UseToolsVersion=
+CALL:_TOOLS_%TargetVisualStudioVersion%
+IF "%UseToolsVersion%"=="" (
+ @ECHO Visual studio version not recognized.
+ GOTO:EOF
+)
+
+SET HackToolsVersion=12.34
+
+REG DELETE "HKLM\Software%WOWRegistryAdjust%\Microsoft\MSBuild\ToolsVersions\%HackToolsVersion%" /f 1>NUL 2>&1
+::Ignore error state, delete fails if the key is not there.
+REG ADD "HKLM\Software%WOWRegistryAdjust%\Microsoft\MSBuild\ToolsVersions\%HackToolsVersion%" 1>NUL 2>&1
+IF ERRORLEVEL 1 (
+ @ECHO Registry write permissions are required for this file.
+ @ECHO Run from a Visual Studio 20xx Command Prompt opened as an Administrator.
+ @PAUSE
+ GOTO:EOF
+)
+REG COPY "HKLM\Software%WOWRegistryAdjust%\Microsoft\MSBuild\ToolsVersions\%UseToolsVersion%" "HKLM\Software%WOWRegistryAdjust%\Microsoft\MSBuild\ToolsVersions\%HackToolsVersion%" /s /f 1>NUL 2>&1
+::VS Doesn't like the empty state on the default value, which is how this ends up. Delete the default value.
+REG DELETE "HKLM\Software%WOWRegistryAdjust%\Microsoft\MSBuild\ToolsVersions\%HackToolsVersion%" /ve /f 1>NUL 2>&1
+GOTO:EOF
+
+
+:SET6432
+::If this batch file is already running under a 32 bit process, then the
+::reg utility will choose the appropriate registry keys without our help.
+::This also means that this file should not be called to pre-set environment
+::variables before invoking 32-bit processes that use these variables.
+IF DEFINED PROCESSOR_ARCHITEW6432 (
+ SET WOWRegistryAdjust=
+) ELSE (
+ SET WOWRegistryAdjust=\Wow6432Node
+)
+GOTO:EOF
+
+:CLEAR64
+SET WOWRegistryAdjust=
+GOTO:EOF
+
+:SETVAR
+SET %~1=%~2
+GOTO:EOF
+
+:_VER_2005
+:_VER_8.0
+:_VER_v8.0
+:_VER_8
+CALL:SETVAR "TargetVisualStudioVersion" "v8.0"
+GOTO:EOF
+
+:_VER_2008
+:_VER_9.0
+:_VER_v9.0
+:_VER_9
+CALL:SETVAR "TargetVisualStudioVersion" "v9.0"
+GOTO:EOF
+
+:_VER_2010
+:_VER_10.0
+:_VER_v10.0
+:_VER_10
+CALL:SETVAR "TargetVisualStudioVersion" "v10.0"
+GOTO:EOF
+
+:_VER_2012
+:_VER_11.0
+:_VER_v11.0
+:_VER_11
+CALL:SETVAR "TargetVisualStudioVersion" "v11.0"
+GOTO:EOF
+
+:_VER_2013
+:_VER_12.0
+:_VER_v12.0
+:_VER_12
+CALL:SETVAR "TargetVisualStudioVersion" "v12.0"
+GOTO:EOF
+
+:_TOOLS_v8.0
+CALL:SETVAR "UseToolsVersion" "2.0"
+GOTO:EOF
+
+:_TOOLS_v9.0
+CALL:SETVAR "UseToolsVersion" "3.5"
+GOTO:EOF
+
+:_TOOLS_v10.0
+:_TOOLS_v11.0
+CALL:SETVAR "UseToolsVersion" "4.0"
+GOTO:EOF
+
+:_TOOLS_v12.0
+CALL:SETVAR "UseToolsVersion" "12.0"
+GOTO:EOF
Modified: trunk/XML/GenerationSamples/GenerationSamples.csproj
===================================================================
--- trunk/XML/GenerationSamples/GenerationSamples.csproj 2014-05-09 03:57:29 UTC (rev 1545)
+++ trunk/XML/GenerationSamples/GenerationSamples.csproj 2014-07-09 23:23:40 UTC (rev 1546)
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.34" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">GenerationSamples</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
