Menu
▾
▴
orm-commits
|
From: <mcu...@us...> - 2013-12-21 06:26:47
|
Revision: 1540
http://sourceforge.net/p/orm/code/1540
Author: mcurland
Date: 2013-12-21 06:26:43 +0000 (Sat, 21 Dec 2013)
Log Message:
-----------
Patch app missed some data type generator files from [1539]
Modified Paths:
--------------
trunk/Setup/Readme.htm
trunk/XML/ConceptualDBtoDCIL/ConceptualDBtoDCIL.xslt
trunk/XML/DILtoSQL/DCILtoDDIL.xslt
trunk/XML/DILtoSQL/DDILtoMySQL.xslt
trunk/XML/DILtoSQL/DDILtoSQLServer.xslt
trunk/XML/DILtoSQL/DDILtoSQLServer_ANSITypes.xslt
trunk/XML/DILtoSQL/DDILtoSQLStandard.xslt
Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm 2013-12-21 06:12:31 UTC (rev 1539)
+++ trunk/Setup/Readme.htm 2013-12-21 06:26:43 UTC (rev 1540)
@@ -72,7 +72,7 @@
<hr/>
<h2><span class="toggle" onclick="toggleDisp(this,'dec2013')">-</span>December 2013 CTP Changes</h2>
<div id="dec2013">
-<div>The December 2013 CTP release includes all modifications through changeset 1539. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
+<div>The December 2013 CTP release includes all modifications through changeset 1540. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
<ul>
<li><a href="#ReadingSignatures 2013-12">Duplicate Reading Signature Validation</a> </li>
<li><a href="#ValueComparisonConstraint 2013-12">Value Comparison Constraints</a> </li>
Modified: trunk/XML/ConceptualDBtoDCIL/ConceptualDBtoDCIL.xslt
===================================================================
(Binary files differ)
Modified: trunk/XML/DILtoSQL/DCILtoDDIL.xslt
===================================================================
(Binary files differ)
Modified: trunk/XML/DILtoSQL/DDILtoMySQL.xslt
===================================================================
--- trunk/XML/DILtoSQL/DDILtoMySQL.xslt 2013-12-21 06:12:31 UTC (rev 1539)
+++ trunk/XML/DILtoSQL/DDILtoMySQL.xslt 2013-12-21 06:26:43 UTC (rev 1540)
@@ -155,7 +155,7 @@
<xsl:text>23</xsl:text>
<xsl:value-of select="$RightParen"/>
</xsl:template>
- <xsl:template match="@type[.='TIMESTAMP']" mode="ForDataType">
+ <xsl:template match="@type[.='TIMESTAMP' or .='DATETIME']" mode="ForDataType">
<!-- Although MySQL has a TIMESTAMP type, their DATETIME is closer to the SQL Standard's TIMESTAMP. -->
<xsl:text>DATETIME</xsl:text>
</xsl:template>
Modified: trunk/XML/DILtoSQL/DDILtoSQLServer.xslt
===================================================================
(Binary files differ)
Modified: trunk/XML/DILtoSQL/DDILtoSQLServer_ANSITypes.xslt
===================================================================
(Binary files differ)
Modified: trunk/XML/DILtoSQL/DDILtoSQLStandard.xslt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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 "%~dp0V...
[truncated message content] |
|
From: <mcu...@us...> - 2014-07-10 06:11:07
|
Revision: 1547
http://sourceforge.net/p/orm/code/1547
Author: mcurland
Date: 2014-07-10 06:11:04 +0000 (Thu, 10 Jul 2014)
Log Message:
-----------
* Additional work on build files. The build helpers were not referencing the correct dll versions, so some of the utility files used in the build were not being found on some builds. Specifically, VS2008 build failed on machines without a simultaneous VS2005 development build. Devtools will need to be rebuilt before a normal build.
* Fixed bug in relational view, which did not like other kinds of table shapes during a database refresh.
Modified Paths:
--------------
trunk/AlternateViews/RelationalView/ShapeModel/RelationalShape.cs
trunk/SetupEnvironment.bat
trunk/Tools/NUBuild/Install.bat
trunk/Tools/NUBuild/NUBuild.csproj
trunk/Tools/NUBuild/Neumont.Build.targets
trunk/Tools/NUBuild/Properties/AssemblyInfo.cs
trunk/Tools/NUBuild/Tasks/Ngen.cs
trunk/Tools/NUBuildVS/NUBuildVS.csproj
trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.Multitargeting.targets
trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
trunk/Tools/NUBuildVS/Properties/AssemblyInfo.cs
Modified: trunk/AlternateViews/RelationalView/ShapeModel/RelationalShape.cs
===================================================================
--- trunk/AlternateViews/RelationalView/ShapeModel/RelationalShape.cs 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/AlternateViews/RelationalView/ShapeModel/RelationalShape.cs 2014-07-10 06:11:04 UTC (rev 1547)
@@ -77,8 +77,8 @@
{
foreach (PresentationElement pel in PresentationViewsSubject.GetPresentation(table))
{
- TableShape shape = pel as TableShape;
- if (pel != null)
+ TableShape shape;
+ if (null != (shape = pel as TableShape))
{
Dictionary<object, object> context = objectType.Store.TransactionManager.CurrentTransaction.TopLevelTransaction.Context.ContextInfo;
object tablePositionsObject;
Modified: trunk/SetupEnvironment.bat
===================================================================
--- trunk/SetupEnvironment.bat 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/SetupEnvironment.bat 2014-07-10 06:11:04 UTC (rev 1547)
@@ -99,6 +99,8 @@
IF NOT DEFINED TargetVisualStudioShortProductName (SET TargetVisualStudioShortProductName=VS2005)
IF NOT DEFINED TargetVisualStudioLongProductName (SET TargetVisualStudioLongProductName=Visual Studio 2005)
IF NOT DEFINED TargetDslToolsAssemblyVersion (SET TargetDslToolsAssemblyVersion=8.2.0.0)
+IF NOT DEFINED ProjectToolsVersion (SET ProjectToolsVersion=2.0)
+IF NOT DEFINED ProjectToolsAssemblyVersion (SET ProjectToolsAssemblyVersion=2.0.0.0)
IF NOT DEFINED VSRegistryConfigHive (SET VSRegistryConfigHive=HKLM)
GOTO:EOF
@@ -112,12 +114,14 @@
IF NOT DEFINED TargetVisualStudioShortProductName (SET TargetVisualStudioShortProductName=VS2008)
IF NOT DEFINED TargetVisualStudioLongProductName (SET TargetVisualStudioLongProductName=Visual Studio 2008)
IF NOT DEFINED TargetDslToolsAssemblyVersion (SET TargetDslToolsAssemblyVersion=9.0.0.0)
+IF NOT DEFINED ProjectToolsVersion (SET ProjectToolsVersion=3.5)
+IF NOT DEFINED ProjectToolsAssemblySuffix (SET ProjectToolsAssemblySuffix=.v3.5)
+IF NOT DEFINED ProjectToolsAssemblyVersion (SET ProjectToolsAssemblyVersion=3.5.0.0)
IF NOT DEFINED VSRegistryConfigHive (SET VSRegistryConfigHive=HKLM)
GOTO:EOF
:_SetupVersionVars_v10.0
IF NOT DEFINED TargetFrameworkVersion (SET TargetFrameworkVersion=v4.0)
-IF NOT DEFINED TargetFrameworkVersionSuffix (SET TargetFrameworkVersionSuffix=.v4.0)
IF NOT DEFINED TargetVisualStudioMajorMinorVersion (SET TargetVisualStudioMajorMinorVersion=10.0)
IF NOT DEFINED TargetVisualStudioAssemblyVersion (SET TargetVisualStudioAssemblyVersion=10.0.0.0)
IF NOT DEFINED TargetVisualStudioFrameworkAssemblyVersion (SET TargetVisualStudioFrameworkAssemblyVersion=4.0.0.0)
@@ -126,6 +130,9 @@
IF NOT DEFINED TargetVisualStudioShortProductName (SET TargetVisualStudioShortProductName=VS2010)
IF NOT DEFINED TargetVisualStudioLongProductName (SET TargetVisualStudioLongProductName=Visual Studio 2010)
IF NOT DEFINED TargetDslToolsAssemblyVersion (SET TargetDslToolsAssemblyVersion=10.0.0.0)
+IF NOT DEFINED ProjectToolsVersion (SET ProjectToolsVersion=4.0)
+IF NOT DEFINED ProjectToolsAssemblySuffix (SET ProjectToolsAssemblySuffix=.v4.0)
+IF NOT DEFINED ProjectToolsAssemblyVersion (SET ProjectToolsAssemblyVersion=4.0.0.0)
IF NOT DEFINED VSRegistryConfigDecorator (SET VSRegistryConfigDecorator=_Config)
IF NOT DEFINED VSRegistryConfigHive (SET VSRegistryConfigHive=HKCU)
IF NOT DEFINED VSIXExtensionDir (SET VSIXExtensionDir=Extensions\ORM Solutions\Natural ORM Architect\1.0)
@@ -133,7 +140,6 @@
:_SetupVersionVars_v11.0
IF NOT DEFINED TargetFrameworkVersion (SET TargetFrameworkVersion=v4.5)
-IF NOT DEFINED TargetFrameworkVersionSuffix (SET TargetFrameworkVersionSuffix=.v4.0)
IF NOT DEFINED TargetVisualStudioMajorMinorVersion (SET TargetVisualStudioMajorMinorVersion=11.0)
IF NOT DEFINED TargetVisualStudioAssemblyVersion (SET TargetVisualStudioAssemblyVersion=11.0.0.0)
IF NOT DEFINED TargetVisualStudioFrameworkAssemblyVersion (SET TargetVisualStudioFrameworkAssemblyVersion=4.5.0.0)
@@ -142,6 +148,9 @@
IF NOT DEFINED TargetVisualStudioShortProductName (SET TargetVisualStudioShortProductName=VS2012)
IF NOT DEFINED TargetVisualStudioLongProductName (SET TargetVisualStudioLongProductName=Visual Studio 2012)
IF NOT DEFINED TargetDslToolsAssemblyVersion (SET TargetDslToolsAssemblyVersion=11.0.0.0)
+IF NOT DEFINED ProjectToolsVersion (SET ProjectToolsVersion=4.0)
+IF NOT DEFINED ProjectToolsAssemblySuffix (SET ProjectToolsAssemblySuffix=.v4.0)
+IF NOT DEFINED ProjectToolsAssemblyVersion (SET ProjectToolsAssemblyVersion=4.0.0.0)
IF NOT DEFINED VSRegistryConfigDecorator (SET VSRegistryConfigDecorator=_Config)
IF NOT DEFINED VSRegistryConfigHive (SET VSRegistryConfigHive=HKCU)
IF NOT DEFINED VSIXExtensionDir (SET VSIXExtensionDir=Extensions\ORM Solutions\Natural ORM Architect\1.0)
@@ -149,7 +158,6 @@
:_SetupVersionVars_v12.0
IF NOT DEFINED TargetFrameworkVersion (SET TargetFrameworkVersion=v4.5)
-IF NOT DEFINED TargetFrameworkVersionSuffix (SET TargetFrameworkVersionSuffix=.v4.0)
IF NOT DEFINED TargetVisualStudioMajorMinorVersion (SET TargetVisualStudioMajorMinorVersion=12.0)
IF NOT DEFINED TargetVisualStudioAssemblyVersion (SET TargetVisualStudioAssemblyVersion=12.0.0.0)
IF NOT DEFINED TargetVisualStudioFrameworkAssemblyVersion (SET TargetVisualStudioFrameworkAssemblyVersion=4.5.0.0)
@@ -158,6 +166,9 @@
IF NOT DEFINED TargetVisualStudioShortProductName (SET TargetVisualStudioShortProductName=VS2013)
IF NOT DEFINED TargetVisualStudioLongProductName (SET TargetVisualStudioLongProductName=Visual Studio 2013)
IF NOT DEFINED TargetDslToolsAssemblyVersion (SET TargetDslToolsAssemblyVersion=12.0.0.0)
+IF NOT DEFINED ProjectToolsVersion (SET ProjectToolsVersion=12.0)
+IF NOT DEFINED ProjectToolsAssemblySuffix (SET ProjectToolsAssemblySuffix=.v12.0)
+IF NOT DEFINED ProjectToolsAssemblyVersion (SET ProjectToolsAssemblyVersion=12.0.0.0)
IF NOT DEFINED VSRegistryConfigDecorator (SET VSRegistryConfigDecorator=_Config)
IF NOT DEFINED VSRegistryConfigHive (SET VSRegistryConfigHive=HKCU)
IF NOT DEFINED VSIXExtensionDir (SET VSIXExtensionDir=Extensions\ORM Solutions\Natural ORM Architect\1.0)
Modified: trunk/Tools/NUBuild/Install.bat
===================================================================
--- trunk/Tools/NUBuild/Install.bat 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuild/Install.bat 2014-07-10 06:11:04 UTC (rev 1547)
@@ -13,7 +13,14 @@
FOR /F "usebackq skip=3 tokens=*" %%A IN (`REG QUERY "HKLM\%VSRegistryRootBase%"`) DO (REG QUERY "%%~A\MSBuild\SafeImports" 1>NUL 2>&1 && IF NOT ERRORLEVEL 1 (REG ADD "%%~A\MSBuild\SafeImports" /v "NUBuild1" /d "%MSBuildExtensionsPath%\Neumont\Neumont.Build.targets" /f))
-gacutil.exe /nologo /f /i "%RootDir%\bin\Neumont.Build.dll"
-ngen.exe install "Neumont.Build, Version=1.0.0.0, Culture=neutral, PublicKeyToken=957d5b7d5e79e25f" /NoDependencies /nologo /verbose
+::Remove legacy versions
+gacutil.exe /nologo /u Neumont.Build,Version=1.0.0.0 1>NUL 2>&1
+gacutil.exe /nologo /u Neumont.Build.VisualStudio,Version=1.0.0.0 1>NUL 2>&1
+::Add new version. We can't do this in the project because we're building the utility that does it.
+::Obviously, the utilities need to be on the path for this to work, which will happen automatically in
+::a Visual Studio command prompt.
+gacutil.exe /nologo /f /i "%RootDir%\bin\Neumont.Build%ProjectToolsAssemblySuffix%.dll"
+ngen.exe install "Neumont.Build%ProjectToolsAssemblySuffix%, Version=%ProjectToolsAssemblyVersion%, Culture=neutral, PublicKeyToken=957d5b7d5e79e25f" /NoDependencies /nologo /verbose
+
GOTO:EOF
Modified: trunk/Tools/NUBuild/NUBuild.csproj
===================================================================
--- trunk/Tools/NUBuild/NUBuild.csproj 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuild/NUBuild.csproj 2014-07-10 06:11:04 UTC (rev 1547)
@@ -11,7 +11,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Neumont.Build</RootNamespace>
- <AssemblyName>Neumont.Build</AssemblyName>
+ <AssemblyName>Neumont.Build$(ProjectToolsAssemblySuffix)</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\ORMPackage.snk</AssemblyOriginatorKeyFile>
<BaseAddress>1413349376</BaseAddress>
@@ -30,15 +30,15 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
<NoWarn>1607</NoWarn>
- <DocumentationFile>bin\Neumont.Build.xml</DocumentationFile>
+ <DocumentationFile>bin\Neumont.Build$(ProjectToolsAssemblySuffix).xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
- <Reference Include="Microsoft.Build.Framework" />
- <Reference Include="Microsoft.Build.Tasks$(TargetFrameworkVersionSuffix)" />
- <Reference Include="Microsoft.Build.Utilities$(TargetFrameworkVersionSuffix)" />
+ <Reference Include="Microsoft.Build.Framework, Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.Build.Tasks$(ProjectToolsAssemblySuffix), Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.Build.Utilities$(ProjectToolsAssemblySuffix), Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -47,9 +47,9 @@
<Compile Include="..\..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
- <Compile Include="..\..\Version.cs">
+ <!--<Compile Include="..\..\Version.cs">
<Link>Properties\Version.cs</Link>
- </Compile>
+ </Compile>-->
<None Include="..\..\ORMPackage.snk">
<Link>Properties\ORMPackage.snk</Link>
</None>
@@ -70,7 +70,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>"$(MSBuildProjectDirectory)\..\..\VersionGenerator.exe"</PreBuildEvent>
+ <!-- <PreBuildEvent>"$(MSBuildProjectDirectory)\..\..\VersionGenerator.exe"</PreBuildEvent> -->
<PostBuildEvent>"$(MSBuildProjectDirectory)\Install.bat"</PostBuildEvent>
</PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Tools/NUBuild/Neumont.Build.targets
===================================================================
--- trunk/Tools/NUBuild/Neumont.Build.targets 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuild/Neumont.Build.targets 2014-07-10 06:11:04 UTC (rev 1547)
@@ -20,7 +20,7 @@
<PropertyGroup>
<!-- The name of the assembly that contains the NUBuild tasks. -->
- <NUBuildTasksAssemblyName>Neumont.Build, Version=1.0.0.0, Culture=neutral, PublicKeyToken=957d5b7d5e79e25f</NUBuildTasksAssemblyName>
+ <NUBuildTasksAssemblyName>Neumont.Build$(ProjectToolsAssemblySuffix), Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=957d5b7d5e79e25f</NUBuildTasksAssemblyName>
</PropertyGroup>
<UsingTask TaskName="Gacutil" AssemblyName="$(NUBuildTasksAssemblyName)"/>
Modified: trunk/Tools/NUBuild/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/NUBuild/Properties/AssemblyInfo.cs 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuild/Properties/AssemblyInfo.cs 2014-07-10 06:11:04 UTC (rev 1547)
@@ -3,20 +3,21 @@
using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
-#if NET_4_0
-[assembly: AssemblyTitle("Neumont.Build.v4.0.dll")]
-#else
[assembly: AssemblyTitle("Neumont.Build.dll")]
-#endif
[assembly: AssemblyProduct("Neumont Build System")]
[assembly: AssemblyDescription("Neumont Build System - Main DLL")]
-
-[assembly: Dependency("Microsoft.Build.Framework,", LoadHint.Always)]
-#if NET_4_0
-[assembly: Dependency("Microsoft.Build.Utilities.v4.0,", LoadHint.Always)]
-[assembly: Dependency("Microsoft.Build.Tasks.v4.0,", LoadHint.Always)]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyVersion(
+#if TOOLS_2_0
+"2.0.0.0"
+#elif TOOLS_3_5
+"3.5.0.0"
+#elif TOOLS_4_0
+"4.0.0.0"
+#elif TOOLS_12_0
+"12.0.0.0"
#else
-[assembly: Dependency("Microsoft.Build.Utilities,", LoadHint.Always)]
-[assembly: Dependency("Microsoft.Build.Tasks,", LoadHint.Always)]
+NEW_TOOLS_VERSION
#endif
-[assembly: Dependency("System.Xml,", LoadHint.Always)]
+)]
Modified: trunk/Tools/NUBuild/Tasks/Ngen.cs
===================================================================
--- trunk/Tools/NUBuild/Tasks/Ngen.cs 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuild/Tasks/Ngen.cs 2014-07-10 06:11:04 UTC (rev 1547)
@@ -41,7 +41,14 @@
/// <summary>See <see cref="ToolTask.GenerateFullPathToTool"/>.</summary>
protected override string GenerateFullPathToTool()
{
- return ToolLocationHelper.GetPathToDotNetFrameworkFile(this.ToolName, TargetDotNetFrameworkVersion.VersionLatest);
+ // Be careful with location ngen doesn't install everywhere
+ TargetDotNetFrameworkVersion useVersion;
+#if NET_4_0
+ useVersion = TargetDotNetFrameworkVersion.Version40;
+#else
+ useVersion = TargetDotNetFrameworkVersion.Version20;
+#endif
+ return ToolLocationHelper.GetPathToDotNetFrameworkFile(this.ToolName, useVersion);
}
/// <summary>See <see cref="ToolTask.ToolName"/>.</summary>
protected override string ToolName
Modified: trunk/Tools/NUBuildVS/NUBuildVS.csproj
===================================================================
--- trunk/Tools/NUBuildVS/NUBuildVS.csproj 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuildVS/NUBuildVS.csproj 2014-07-10 06:11:04 UTC (rev 1547)
@@ -10,7 +10,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Neumont.Build.VisualStudio</RootNamespace>
- <AssemblyName>Neumont.Build.VisualStudio</AssemblyName>
+ <AssemblyName>Neumont.Build.VisualStudio$(ProjectToolsAssemblySuffix)</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\ORMPackage.snk</AssemblyOriginatorKeyFile>
<BaseAddress>1414397952</BaseAddress>
@@ -32,8 +32,8 @@
<DocumentationFile>bin\Neumont.Build.VisualStudio.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.Build.Framework" />
- <Reference Include="Microsoft.Build.Utilities$(TargetFrameworkVersionSuffix)" />
+ <Reference Include="Microsoft.Build.Framework, Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.Build.Utilities$(ProjectToolsAssemblySuffix), Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
@@ -41,9 +41,9 @@
<Compile Include="..\..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
- <Compile Include="..\..\Version.cs">
+ <!-- <Compile Include="..\..\Version.cs">
<Link>Properties\Version.cs</Link>
- </Compile>
+ </Compile> -->
<None Include="..\..\ORMPackage.snk">
<Link>Properties\ORMPackage.snk</Link>
</None>
@@ -57,7 +57,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Neumont\Neumont.Build.targets" />
<PropertyGroup>
- <PreBuildEvent>"$(MSBuildProjectDirectory)\..\..\VersionGenerator.exe"</PreBuildEvent>
+ <!-- <PreBuildEvent>"$(MSBuildProjectDirectory)\..\..\VersionGenerator.exe"</PreBuildEvent> -->
<PostBuildEvent>"$(MSBuildProjectDirectory)\Install.bat"</PostBuildEvent>
</PropertyGroup>
</Project>
Modified: trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.Multitargeting.targets
===================================================================
--- trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.Multitargeting.targets 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.Multitargeting.targets 2014-07-10 06:11:04 UTC (rev 1547)
@@ -43,6 +43,7 @@
<TargetDslToolsAssemblyVersion Condition=" '$(TargetDslToolsAssemblyVersion)' == '' ">8.2.0.0</TargetDslToolsAssemblyVersion>
<GeneratedDslFileSuffix Condition=" '$GeneratedDslFileSuffix)' == '' "></GeneratedDslFileSuffix>
<ProjectToolsVersion Condition=" '$(ProjectToolsVersion)' == '' ">2.0</ProjectToolsVersion>
+ <ProjectToolsAssemblyVersion Condition=" '$(ProjectToolsAssemblyVersion)' == '' ">2.0.0.0</ProjectToolsAssemblyVersion>
</PropertyGroup>
</When>
<When Condition=" '$(TargetVisualStudioVersion)' == 'v9.0' ">
@@ -59,12 +60,13 @@
<TargetDslToolsAssemblyVersion Condition=" '$(TargetDslToolsAssemblyVersion)' == '' ">9.0.0.0</TargetDslToolsAssemblyVersion>
<GeneratedDslFileSuffix Condition=" '$(GeneratedDslFileSuffix)' == '' "></GeneratedDslFileSuffix>
<ProjectToolsVersion Condition=" '$(ProjectToolsVersion)' == '' ">3.5</ProjectToolsVersion>
+ <ProjectToolsAssemblySuffix Condition=" '$(ProjectToolsAssemblySuffix)' == '' ">.v3.5</ProjectToolsAssemblySuffix>
+ <ProjectToolsAssemblyVersion Condition=" '$(ProjectToolsAssemblyVersion)' == '' ">3.5.0.0</ProjectToolsAssemblyVersion>
</PropertyGroup>
</When>
<When Condition=" '$(TargetVisualStudioVersion)' == 'v10.0' ">
<PropertyGroup>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
- <TargetFrameworkVersionSuffix Condition=" '$(TargetFrameworkVersionSuffix)' == '' ">.v4.0</TargetFrameworkVersionSuffix>
<TargetVisualStudioAssemblyVersion Condition=" '$(TargetVisualStudioAssemblyVersion)' == '' ">10.0.0.0</TargetVisualStudioAssemblyVersion>
<TargetVisualStudioAssemblySuffix Condition=" '$(TargetVisualStudioAssemblySuffix)' == '' ">.10.0</TargetVisualStudioAssemblySuffix>
<TargetVisualStudioFrameworkAssemblyVersion Condition=" '$(TargetVisualStudioFrameworkAssemblyVersion)' == '' ">4.0.0.0</TargetVisualStudioFrameworkAssemblyVersion>
@@ -76,6 +78,8 @@
<TargetDslToolsAssemblyVersion Condition=" '$(TargetDslToolsAssemblyVersion)' == '' ">10.0.0.0</TargetDslToolsAssemblyVersion>
<TargetDslToolsVersionSuffix Condition=" '$(TargetDslToolsVersionSuffix)' == '' ">.10.0</TargetDslToolsVersionSuffix>
<ProjectToolsVersion Condition=" '$(ProjectToolsVersion)' == '' ">4.0</ProjectToolsVersion>
+ <ProjectToolsAssemblySuffix Condition=" '$(ProjectToolsAssemblySuffix)' == '' ">.v4.0</ProjectToolsAssemblySuffix>
+ <ProjectToolsAssemblyVersion Condition=" '$(ProjectToolsAssemblyVersion)' == '' ">4.0.0.0</ProjectToolsAssemblyVersion>
<GeneratedDslFileSuffix Condition=" '$(GeneratedDslFileSuffix)' == '' ">.VS2010</GeneratedDslFileSuffix>
<DefineConstants>$(DefineConstants);NO_SECURITYPERMISSIONATTRIBUTE</DefineConstants>
</PropertyGroup>
@@ -83,7 +87,6 @@
<When Condition=" '$(TargetVisualStudioVersion)' == 'v11.0' ">
<PropertyGroup>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.5</TargetFrameworkVersion>
- <TargetFrameworkVersionSuffix Condition=" '$(TargetFrameworkVersionSuffix)' == '' ">.v4.0</TargetFrameworkVersionSuffix>
<TargetVisualStudioAssemblyVersion Condition=" '$(TargetVisualStudioAssemblyVersion)' == '' ">11.0.0.0</TargetVisualStudioAssemblyVersion>
<TargetVisualStudioAssemblySuffix Condition=" '$(TargetVisualStudioAssemblySuffix)' == '' ">.11.0</TargetVisualStudioAssemblySuffix>
<TargetVisualStudioFrameworkAssemblyVersion Condition=" '$(TargetVisualStudioFrameworkAssemblyVersion)' == '' ">4.5.0.0</TargetVisualStudioFrameworkAssemblyVersion>
@@ -95,6 +98,8 @@
<TargetDslToolsAssemblyVersion Condition=" '$(TargetDslToolsAssemblyVersion)' == '' ">11.0.0.0</TargetDslToolsAssemblyVersion>
<TargetDslToolsVersionSuffix Condition=" '$(TargetDslToolsVersionSuffix)' == '' ">.11.0</TargetDslToolsVersionSuffix>
<ProjectToolsVersion Condition=" '$(ProjectToolsVersion)' == '' ">4.0</ProjectToolsVersion>
+ <ProjectToolsAssemblySuffix Condition=" '$(ProjectToolsAssemblySuffix)' == '' ">.v4.0</ProjectToolsAssemblySuffix>
+ <ProjectToolsAssemblyVersion Condition=" '$(ProjectToolsAssemblyVersion)' == '' ">4.0.0.0</ProjectToolsAssemblyVersion>
<GeneratedDslFileSuffix Condition=" '$(GeneratedDslFileSuffix)' == '' ">.VS2010</GeneratedDslFileSuffix>
<DefineConstants>$(DefineConstants);NO_SECURITYPERMISSIONATTRIBUTE</DefineConstants>
</PropertyGroup>
@@ -102,7 +107,6 @@
<When Condition=" '$(TargetVisualStudioVersion)' == 'v12.0' ">
<PropertyGroup>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.5</TargetFrameworkVersion>
- <TargetFrameworkVersionSuffix Condition=" '$(TargetFrameworkVersionSuffix)' == '' ">.v4.0</TargetFrameworkVersionSuffix>
<TargetVisualStudioAssemblyVersion Condition=" '$(TargetVisualStudioAssemblyVersion)' == '' ">12.0.0.0</TargetVisualStudioAssemblyVersion>
<TargetVisualStudioAssemblySuffix Condition=" '$(TargetVisualStudioAssemblySuffix)' == '' ">.12.0</TargetVisualStudioAssemblySuffix>
<TargetVisualStudioFrameworkAssemblyVersion Condition=" '$(TargetVisualStudioFrameworkAssemblyVersion)' == '' ">4.5.0.0</TargetVisualStudioFrameworkAssemblyVersion>
@@ -114,6 +118,8 @@
<TargetDslToolsAssemblyVersion Condition=" '$(TargetDslToolsAssemblyVersion)' == '' ">12.0.0.0</TargetDslToolsAssemblyVersion>
<TargetDslToolsVersionSuffix Condition=" '$(TargetDslToolsVersionSuffix)' == '' ">.12.0</TargetDslToolsVersionSuffix>
<ProjectToolsVersion Condition=" '$(ProjectToolsVersion)' == '' ">12.0</ProjectToolsVersion>
+ <ProjectToolsAssemblySuffix Condition=" '$(ProjectToolsAssemblySuffix)' == '' ">.v12.0</ProjectToolsAssemblySuffix>
+ <ProjectToolsAssemblyVersion Condition=" '$(ProjectToolsAssemblyVersion)' == '' ">12.0.0.0</ProjectToolsAssemblyVersion>
<GeneratedDslFileSuffix Condition=" '$(GeneratedDslFileSuffix)' == '' ">.VS2010</GeneratedDslFileSuffix>
<DefineConstants>$(DefineConstants);NO_SECURITYPERMISSIONATTRIBUTE</DefineConstants>
</PropertyGroup>
@@ -181,8 +187,32 @@
</When>
</Choose>
+ <!-- Set up conditional compilation constants for tools version. -->
+ <Choose>
+ <When Condition=" '$(ProjectToolsVersion)' == '2.0' ">
+ <PropertyGroup>
+ <DefineConstants>$(DefineConstants);TOOLS_2_0</DefineConstants>
+ </PropertyGroup>
+ </When>
+ <When Condition=" '$(ProjectToolsVersion)' == '3.5' ">
+ <PropertyGroup>
+ <DefineConstants>$(DefineConstants);TOOLS_3_5</DefineConstants>
+ </PropertyGroup>
+ </When>
+ <When Condition=" '$(ProjectToolsVersion)' == '4.0' ">
+ <PropertyGroup>
+ <DefineConstants>$(DefineConstants);TOOLS_4_0</DefineConstants>
+ </PropertyGroup>
+ </When>
+ <When Condition=" '$(ProjectToolsVersion)' == '12.0' ">
+ <PropertyGroup>
+ <DefineConstants>$(DefineConstants);TOOLS_12_0</DefineConstants>
+ </PropertyGroup>
+ </When>
+ </Choose>
- <!-- This is here because the MSBuild schema requires at least one Target or Import to be present. -->
+
+ <!-- This is here because the MSBuild schema requires at least one Target or Import to be present. -->
<Target Name="_Neumont_Build_VisualStudio_Multitargeting_DummyTarget" Condition="'false'"/>
Modified: trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
===================================================================
--- trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets 2014-07-10 06:11:04 UTC (rev 1547)
@@ -20,7 +20,7 @@
<PropertyGroup>
<!-- The name of the assembly that contains the NUBuildVS tasks. -->
- <NUBuildVSTasksAssemblyName>Neumont.Build.VisualStudio, Version=1.0.0.0, Culture=neutral, PublicKeyToken=957d5b7d5e79e25f</NUBuildVSTasksAssemblyName>
+ <NUBuildVSTasksAssemblyName>Neumont.Build.VisualStudio$(ProjectToolsAssemblySuffix), Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=957d5b7d5e79e25f</NUBuildVSTasksAssemblyName>
</PropertyGroup>
<UsingTask TaskName="VsSdkLocator" AssemblyName="$(NUBuildVSTasksAssemblyName)"/>
Modified: trunk/Tools/NUBuildVS/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/NUBuildVS/Properties/AssemblyInfo.cs 2014-07-09 23:23:40 UTC (rev 1546)
+++ trunk/Tools/NUBuildVS/Properties/AssemblyInfo.cs 2014-07-10 06:11:04 UTC (rev 1547)
@@ -7,5 +7,18 @@
[assembly: AssemblyProduct("Neumont Build System")]
[assembly: AssemblyDescription("Neumont Build System - Visual Studio Targets DLL")]
-[assembly: Dependency("Microsoft.Build.Framework,", LoadHint.Always)]
-[assembly: Dependency("Microsoft.Build.Utilities,", LoadHint.Always)]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: AssemblyVersion(
+#if TOOLS_2_0
+"2.0.0.0"
+#elif TOOLS_3_5
+"3.5.0.0"
+#elif TOOLS_4_0
+"4.0.0.0"
+#elif TOOLS_12_0
+"12.0.0.0"
+#else
+NEW_TOOLS_VERSION
+#endif
+)]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mcu...@us...> - 2014-11-21 17:47:19
|
Revision: 1551
http://sourceforge.net/p/orm/code/1551
Author: mcurland
Date: 2014-11-21 17:47:16 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Bug fixes:
* Fix sample population editor VS crash with recursive identifiers.
* Allow test framework to run on 64-bit machines.
Modified Paths:
--------------
trunk/ORM2CommandLineTest/ReportViewer.csproj
trunk/ORM2CommandLineTest/TestDriverApp.csproj
trunk/ORM2CommandLineTest/install.bat
trunk/ORMModel/ObjectModel/SamplePopulation.cs
trunk/ORMModel/Shell/SamplePopulationEditor.cs
Modified: trunk/ORM2CommandLineTest/ReportViewer.csproj
===================================================================
--- trunk/ORM2CommandLineTest/ReportViewer.csproj 2014-11-21 16:29:21 UTC (rev 1550)
+++ trunk/ORM2CommandLineTest/ReportViewer.csproj 2014-11-21 17:47:16 UTC (rev 1551)
@@ -21,6 +21,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1607</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>1607</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -135,4 +137,4 @@
<PropertyGroup>
<PostBuildEvent>"$(ProjectDir)install.bat" "$(ProjectDir)" "$(OutDir)" "$(DevEnvDir)\..\..\" "$(TargetVisualStudioShortProductName)" "$(TargetVisualStudioLongProductName)"</PostBuildEvent>
</PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/ORM2CommandLineTest/TestDriverApp.csproj
===================================================================
--- trunk/ORM2CommandLineTest/TestDriverApp.csproj 2014-11-21 16:29:21 UTC (rev 1550)
+++ trunk/ORM2CommandLineTest/TestDriverApp.csproj 2014-11-21 17:47:16 UTC (rev 1551)
@@ -36,6 +36,7 @@
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
<NoWarn>1607</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -43,6 +44,7 @@
<OutputPath>.\bin\Release\</OutputPath>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<NoWarn>1607</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Modeling.Sdk, Version=$(TargetDslToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -94,4 +96,4 @@
<PropertyGroup>
<PostBuildEvent>"$(ProjectDir)install.bat" "$(ProjectDir)" "$(OutDir)" "$(DevEnvDir)\..\..\" "$(TargetVisualStudioShortProductName)" "$(TargetVisualStudioLongProductName)"</PostBuildEvent>
</PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/ORM2CommandLineTest/install.bat
===================================================================
--- trunk/ORM2CommandLineTest/install.bat 2014-11-21 16:29:21 UTC (rev 1550)
+++ trunk/ORM2CommandLineTest/install.bat 2014-11-21 17:47:16 UTC (rev 1551)
@@ -9,9 +9,9 @@
)
if '%1'=='' (
-set rootPath=%~dp0
+CALL:SETVAR "rootPath" "%~dp0"
) else (
-set rootPath=%~dp1
+CALL:SETVAR "rootPath" "%~dp1"
)
if '%2'=='' (
set outDir=bin\Debug\
@@ -19,9 +19,9 @@
set outDir=%~2
)
if '%3'=='' (
-set envPath=%ResolvedProgramFiles%\Microsoft Visual Studio 8\
+CALL:SETVAR "envPath" "%ResolvedProgramFiles%\Microsoft Visual Studio 8\"
) else (
-set envPath=%~dp3
+CALL:SETVAR "envPath" "%~dp3"
)
if '%4'=='' (
set VSProduct=VS2005
@@ -89,3 +89,7 @@
SET WOWRegistryAdjust=\Wow6432Node
)
GOTO:EOF
+
+:SETVAR
+SET %~1=%~2
+GOTO:EOF
Modified: trunk/ORMModel/ObjectModel/SamplePopulation.cs
===================================================================
--- trunk/ORMModel/ObjectModel/SamplePopulation.cs 2014-11-21 16:29:21 UTC (rev 1550)
+++ trunk/ORMModel/ObjectModel/SamplePopulation.cs 2014-11-21 17:47:16 UTC (rev 1551)
@@ -3600,7 +3600,7 @@
valueNonTextFormat = null;
}
string listSeparator = null;
- string retVal = (parentObjectType == null) ? "" : RecurseObjectTypeInstanceValue(objectInstance, parentObjectType, ignoreObjectification, false, null, null, ref listSeparator, ref outputText, formatProvider, valueTextFormat, valueNonTextFormat, false);
+ string retVal = (parentObjectType == null) ? "" : RecurseObjectTypeInstanceValue(objectInstance, parentObjectType, ignoreObjectification, false, null, null, ref listSeparator, ref outputText, formatProvider, valueTextFormat, valueNonTextFormat, false, null);
retVal = (outputText != null) ? outputText.ToString() : retVal;
return (retVal == null) ? "" : retVal.Trim();
}
@@ -3627,12 +3627,12 @@
valueNonTextFormat = null;
}
string listSeparator = null;
- string retVal = (parentFactType == null) ? "" : RecurseObjectTypeInstanceValue(null, null, false, false, factInstance, parentFactType, ref listSeparator, ref outputText, formatProvider, valueTextFormat, valueNonTextFormat, false);
+ string retVal = (parentFactType == null) ? "" : RecurseObjectTypeInstanceValue(null, null, false, false, factInstance, parentFactType, ref listSeparator, ref outputText, formatProvider, valueTextFormat, valueNonTextFormat, false, null);
retVal = (outputText != null) ? outputText.ToString() : retVal;
return (retVal == null) ? "" : retVal.Trim();
}
- private static string RecurseObjectTypeInstanceValue(ObjectTypeInstance objectInstance, ObjectType parentObjectType, bool ignoreObjectification, bool nestedLeadValue, FactTypeInstance factInstance, FactType parentFactType, ref string listSeparator, ref StringBuilder outputText, IFormatProvider formatProvider, string valueTextFormat, string valueNonTextFormat, bool outerGrouping)
+ private static string RecurseObjectTypeInstanceValue(ObjectTypeInstance objectInstance, ObjectType parentObjectType, bool ignoreObjectification, bool nestedLeadValue, FactTypeInstance factInstance, FactType parentFactType, ref string listSeparator, ref StringBuilder outputText, IFormatProvider formatProvider, string valueTextFormat, string valueNonTextFormat, bool outerGrouping, Predicate<ObjectType> stackCheck)
{
string blankValueText = nestedLeadValue ? " " : "";
DataType dataType;
@@ -3668,12 +3668,22 @@
}
return valueText;
}
+ else if (parentObjectType != null && objectInstance == null && stackCheck != null && stackCheck(parentObjectType))
+ {
+ if (outputText != null)
+ {
+ outputText.Append(blankValueText);
+ return null;
+ }
+ return blankValueText;
+ }
else
{
IList<Role> roles = null;
int roleCount = 0;
FactType objectifiedFactType = null;
EntityTypeInstance entityInstance = null;
+ Predicate<ObjectType> recurseStackCheck = null;
if (parentFactType != null)
{
// Just do the FactType tuple, without any identifier parts
@@ -3712,7 +3722,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- outerGrouping);
+ outerGrouping,
+ stackCheck);
}
else if (preferredFor != null && preferredFor != parentObjectType)
{
@@ -3739,7 +3750,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- false);
+ false,
+ recurseStackCheck ?? (recurseStackCheck = CreateRecursiveIdentifierStackCheck(preferredFor, stackCheck)));
outputText.Append(listSeparator ?? (listSeparator = GetListSeparator(formatProvider)));
RecurseObjectTypeInstanceValue(
null,
@@ -3753,7 +3765,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- true);
+ true,
+ stackCheck);
if (!outerGrouping)
{
outputText.Append(")");
@@ -3776,7 +3789,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- outerGrouping);
+ outerGrouping,
+ recurseStackCheck ?? (recurseStackCheck = CreateRecursiveIdentifierStackCheck(preferredFor, stackCheck)));
}
entityInstance = objectInstance as EntityTypeInstance;
if (identifier != null)
@@ -3826,9 +3840,10 @@
{
roleInstance = factInstance.FindRoleInstance(role);
}
+ ObjectType rolePlayer = role.RolePlayer;
string retVal = RecurseObjectTypeInstanceValue(
(roleInstance != null) ? roleInstance.ObjectTypeInstance : null,
- role.RolePlayer,
+ rolePlayer,
false,
nestedLeadValue,
null,
@@ -3838,7 +3853,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- false);
+ false,
+ recurseStackCheck ?? (recurseStackCheck = CreateRecursiveIdentifierStackCheck(rolePlayer, stackCheck)));
if (objectifiedFactType == null)
{
return retVal;
@@ -3906,9 +3922,10 @@
}
}
}
+ ObjectType rolePlayer = role.RolePlayer;
RecurseObjectTypeInstanceValue(
(matchInstance != null) ? matchInstance.ObjectTypeInstance : null,
- role.RolePlayer,
+ rolePlayer,
false,
i == 0 && !outerGrouping,
null,
@@ -3918,7 +3935,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- false);
+ false,
+ recurseStackCheck ?? (recurseStackCheck = CreateRecursiveIdentifierStackCheck(rolePlayer, stackCheck)));
}
if (!outerGrouping)
{
@@ -3941,7 +3959,8 @@
formatProvider,
valueTextFormat,
valueNonTextFormat,
- true);
+ true,
+ stackCheck);
if (!outerGrouping)
{
outputText.Append(")");
@@ -3950,6 +3969,22 @@
return null;
}
}
+ /// <summary>
+ /// Helper to create a delegate to determine if an identifier is recursively defined. If we have
+ /// a recursive identifier then we do not continue past an empty instance.
+ /// </summary>
+ /// <param name="rolePlayer">The current role player.</param>
+ /// <param name="contextStackCheck">A context delegate from higher up in the object tree.</param>
+ /// <returns>New stack check.</returns>
+ private static Predicate<ObjectType> CreateRecursiveIdentifierStackCheck(ObjectType rolePlayer, Predicate<ObjectType> contextStackCheck)
+ {
+ return rolePlayer == null ?
+ contextStackCheck :
+ delegate(ObjectType recursiveRolePlayer)
+ {
+ return rolePlayer == recursiveRolePlayer || (contextStackCheck != null && contextStackCheck(recursiveRolePlayer));
+ };
+ }
private static string GetListSeparator(IFormatProvider formatProvider)
{
CultureInfo cultureInfo = formatProvider as CultureInfo ?? CultureInfo.CurrentCulture;
Modified: trunk/ORMModel/Shell/SamplePopulationEditor.cs
===================================================================
--- trunk/ORMModel/Shell/SamplePopulationEditor.cs 2014-11-21 16:29:21 UTC (rev 1550)
+++ trunk/ORMModel/Shell/SamplePopulationEditor.cs 2014-11-21 17:47:16 UTC (rev 1551)
@@ -3133,7 +3133,7 @@
public static string DeriveColumnName(Role role, bool ignoreObjectification)
{
StringBuilder outputText = null;
- string retVal = (role == null || role.RolePlayer == null) ? ResourceStrings.ModelSamplePopulationEditorNullSelection : RecurseColumnIdentifier(role, null, ignoreObjectification, null, ref outputText);
+ string retVal = (role == null || role.RolePlayer == null) ? ResourceStrings.ModelSamplePopulationEditorNullSelection : RecurseColumnIdentifier(role, null, ignoreObjectification, null, null, ref outputText);
return (outputText != null) ? outputText.ToString() : retVal;
}
public static string DeriveColumnName(ObjectType objectType)
@@ -3143,7 +3143,7 @@
public static string DeriveColumnName(ObjectType objectType, bool ignoreObjectification)
{
StringBuilder outputText = null;
- string retVal = (objectType == null) ? ResourceStrings.ModelSamplePopulationEditorNullSelection : RecurseColumnIdentifier(null, objectType, ignoreObjectification, null, ref outputText);
+ string retVal = (objectType == null) ? ResourceStrings.ModelSamplePopulationEditorNullSelection : RecurseColumnIdentifier(null, objectType, ignoreObjectification, null, null, ref outputText);
return (outputText != null) ? outputText.ToString() : retVal;
}
protected static string GetRolePlayerTypeName(Role role, bool useRoleName)
@@ -3158,7 +3158,7 @@
return retVal;
}
// UNDONE: This whole method needs to be localized
- private static string RecurseColumnIdentifier(Role role, ObjectType rolePlayer, bool ignoreObjectification, string listSeparator, ref StringBuilder outputText)
+ private static string RecurseColumnIdentifier(Role role, ObjectType rolePlayer, bool ignoreObjectification, string listSeparator, Predicate<ObjectType> stackCheck, ref StringBuilder outputText)
{
if (rolePlayer == null)
{
@@ -3169,14 +3169,26 @@
if (outputText != null)
{
outputText.Append(" ");
+ return null;
}
return " ";
}
+ if (stackCheck != null && stackCheck(rolePlayer))
+ {
+ if (outputText != null)
+ {
+ outputText.Append(rolePlayer.Name);
+ outputText.Append(ResourceStrings.ReadingShapeEllipsis);
+ return null;
+ }
+ return rolePlayer.Name + ResourceStrings.ReadingShapeEllipsis;
+ }
string roleName = (role != null) ? role.Name : "";
string derivedName = (roleName.Length != 0) ? roleName : rolePlayer.Name;
UniquenessConstraint identifier = null;
ObjectType supertypeRolePlayer = null;
bool isValueType = rolePlayer.IsValueType;
+ Predicate<ObjectType> nextStackCheck = isValueType ? stackCheck : null; // The value type won't recurse over its preferred identifier.
FactType nestedFactType = (ignoreObjectification || isValueType) ? null : rolePlayer.NestedFactType;
bool useIdentifiedReferenceMode = false;
if (isValueType)
@@ -3221,11 +3233,12 @@
}
outputText.Append(derivedName);
outputText.Append("(");
+
bool identifierWritten = false;
if (supertypeRolePlayer != null &&
supertypeRolePlayer != rolePlayer)
{
- RecurseColumnIdentifier(null, supertypeRolePlayer, false, listSeparator, ref outputText);
+ RecurseColumnIdentifier(null, supertypeRolePlayer, false, listSeparator, nextStackCheck ?? (nextStackCheck = CreateColumnIdentifierStackCheck(rolePlayer, stackCheck)), ref outputText);
identifierWritten = true;
}
else
@@ -3262,7 +3275,7 @@
{
outputText.Append(listSeparator);
}
- RecurseColumnIdentifier(identifierRole, null, false, listSeparator, ref outputText);
+ RecurseColumnIdentifier(identifierRole, null, false, listSeparator, nextStackCheck ?? (nextStackCheck = CreateColumnIdentifierStackCheck(rolePlayer, stackCheck)), ref outputText);
}
}
identifierWritten = true;
@@ -3287,13 +3300,26 @@
{
outputText.Append(listSeparator);
}
- RecurseColumnIdentifier(factRole, null, false, listSeparator, ref outputText);
+ RecurseColumnIdentifier(factRole, null, false, listSeparator, nextStackCheck ?? (nextStackCheck = CreateColumnIdentifierStackCheck(rolePlayer, stackCheck)), ref outputText);
}
}
outputText.Append(")");
return null;
}
/// <summary>
+ /// Helper to create a delegate to determine if a role player is recursively defined.
+ /// </summary>
+ /// <param name="rolePlayer">The current role player.</param>
+ /// <param name="contextStackCheck">A context delegate from higher up in the object tree.</param>
+ /// <returns>New stack check.</returns>
+ private static Predicate<ObjectType> CreateColumnIdentifierStackCheck(ObjectType rolePlayer, Predicate<ObjectType> contextStackCheck)
+ {
+ return delegate(ObjectType recursiveRolePlayer)
+ {
+ return rolePlayer == recursiveRolePlayer || (contextStackCheck != null && contextStackCheck(recursiveRolePlayer));
+ };
+ }
+ /// <summary>
/// Determine if the specified instance is empty. A <see cref="ValueTypeInstance"/>
/// is never empty, an <see cref="EntityTypeInstance"/> is empty if it has not
/// attached instances, and a <see cref="EntityTypeSubtypeInstance"/> is empty if
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mcu...@us...> - 2015-01-08 02:17:36
|
Revision: 1558
http://sourceforge.net/p/orm/code/1558
Author: mcurland
Date: 2015-01-08 02:17:32 +0000 (Thu, 08 Jan 2015)
Log Message:
-----------
* Make attaching a subset constraint to a subtype line more consistent with other editing actions by allowing a double-click commit on the constrained subtype line.
* Updated constraint editing instructions to include directions for subtype lines.
* Updated version and readme files pending January 2015 CTP refs #193
Modified Paths:
--------------
trunk/ORMModel/ShapeModel/ExternalConstraintConnectAction.cs
trunk/ORMModel/ShapeModel/ORMDiagram.resx
trunk/Setup/Readme.htm
trunk/VersionGenerator.exe.config
Modified: trunk/ORMModel/ShapeModel/ExternalConstraintConnectAction.cs
===================================================================
--- trunk/ORMModel/ShapeModel/ExternalConstraintConnectAction.cs 2015-01-02 06:08:27 UTC (rev 1557)
+++ trunk/ORMModel/ShapeModel/ExternalConstraintConnectAction.cs 2015-01-08 02:17:32 UTC (rev 1558)
@@ -95,11 +95,16 @@
if (sourceShapeElement is ExternalConstraintShape)
{
bool isFactTypeShape;
- if ((isFactTypeShape = targetShapeElement is FactTypeShape) || targetShapeElement is SubtypeLink)
+ SubtypeLink subtypeLink = null;
+ if ((isFactTypeShape = targetShapeElement is FactTypeShape) || null != (subtypeLink = targetShapeElement as SubtypeLink))
{
ExternalConstraintConnectAction action = (sourceShapeElement.Diagram as ORMDiagram).ExternalConstraintConnectAction;
retVal = action != null &&
- ((action.mySubtypeConnection && !action.mySubtypeAnchoredSubset) || isFactTypeShape || action.myAllowSubtypeConnection);
+ ((action.mySubtypeConnection && !action.mySubtypeAnchoredSubset) ||
+ isFactTypeShape ||
+ action.myAllowSubtypeConnection ||
+ // Allow a double-click commit on the anchor supertype for a subset constraint
+ (action.mySubtypeAnchoredSubset && subtypeLink != null && subtypeLink.AssociatedSubtypeFact.SupertypeRole == action.SelectedRoleCollection[0]));
}
else
{
Modified: trunk/ORMModel/ShapeModel/ORMDiagram.resx
===================================================================
--- trunk/ORMModel/ShapeModel/ORMDiagram.resx 2015-01-02 06:08:27 UTC (rev 1557)
+++ trunk/ORMModel/ShapeModel/ORMDiagram.resx 2015-01-08 02:17:32 UTC (rev 1558)
@@ -333,18 +333,20 @@
</data>
<data name="ExternalConstraintConnectAction.SetComparisonConstraint.Instructions">
<value xml:space="preserve">To select role sequences to populate the constraint:
--Click a role to add it to the active role sequence
--Control-Click a role to remove it from the active role sequence
+-Click a role or subtype line to add it to the active role sequence
+-Control-Click a role or subtype line to remove it from the active role sequence
-Double-Click a role to commit the active role sequence and begin a new role sequence
--Click the diagram background or press Escape to finish</value>
+-Click the diagram background or press Escape to cancel an uncommitted role sequence
+
+If a subtype is constrained use single-click to add and double-click to commit.</value>
<comment xml:space="preserve">The text shown to explain how to hook up an external constraint to its associated roles.</comment>
</data>
<data name="ExternalConstraintConnectAction.SetConstraint.Instructions">
<value xml:space="preserve">To select role sequences to populate the constraint:
--Click a role to add it to the constraint
--Control-Click a role to remove it from the constaint
--Double-Click a role to commit
--Click the diagram background or press Escape to finish</value>
+-Click a role or subtype line to add it to the constraint
+-Control-Click a role or subtype line to remove it from the constaint
+-Double-Click a role or subtype line to commit
+-Click the diagram background or press Escape to cancel</value>
<comment xml:space="preserve">The text shown to explain how to hook up an external constraint to its associated roles.</comment>
</data>
<data name="ExternalConstraintConnectAction.TransactionName">
Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm 2015-01-02 06:08:27 UTC (rev 1557)
+++ trunk/Setup/Readme.htm 2015-01-08 02:17:32 UTC (rev 1558)
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
-<title>NORMA December 2013 CTP Readme</title>
+<title>NORMA January 2015 CTP Readme</title>
<style type="text/css">
.new {font-size:x-small; background-color:Gold; color:Blue; }
.toggle{font-size:larger;cursor:pointer;font-family: monospace; color:rgb(97, 133, 160); display:inline; padding-right:.15em;}
@@ -35,9 +35,9 @@
<body>
-<p><b><a id="The Top" style="font-family:Verdana;font-size:medium">NORMA December 2013 CTP Readme</a> </b></p>
+<p><b><a id="The Top" style="font-family:Verdana;font-size:medium">NORMA January 2015 CTP Readme</a> </b></p>
<p>This file supersedes the previous readme.txt and older readme.htm files. This readme has parallel indexing mechanisms: by topic, and by release date (starting with the October 2008 (2008-10) release). The file will be extended for future product releases.<br/><br/>
-The December 2013 release adds support for Visual Studio 2013, implements value comparison and cardinality constraints, adds validation checks for duplicate fact type reading signatures, adds new menu items for managing validation errors, and changes relational mapping defaults for entity types identified with an autocounter data type. See detailed change notes below for specifics.<br/><br/>
+The January 2015 is primarily a bug fix release. Support has also been added for import from an Oracle database. See detailed change notes below for specifics.<br/><br/>
</p>
<h2><span class="toggle" onclick="toggleDisp(this,'contents')">-</span>Contents</h2>
<div id="contents">
@@ -70,10 +70,43 @@
</div>-->
<hr/>
-<h2><span class="toggle" onclick="toggleDisp(this,'dec2013')">-</span>December 2013 CTP Changes</h2>
-<div id="dec2013">
-<div>The December 2013 CTP release includes all modifications through changeset 1540. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
+<h2><span class="toggle" onclick="toggleDisp(this,'jan2015')">-</span>January 2015 CTP Changes</h2>
+<div id="jan2015">
+<div>The January 2015 CTP release includes all modifications through changeset 1558. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
<ul>
+<li>Feature Changes:
+<ol>
+<li>Added database import support for Oracle using the ODAC drivers (thanks to Jose Carlus).</li>
+<li>Data type verbalization now shows the scale/length/precision of a data type if these values are set.</li>
+<li>Allow the sample population editor to display recursive identifiers. Note that this will still crash other parts of the system (like relational generation), but can at least be viewed conceptually. The use of a surrogate identifier is recommended in this case.</li>
+</ol>
+</li>
+<li>Bug Fixes:
+<ol>
+<li>Sample population mandatory errors display incorrectly for compatible but not equal role players. Errors should be displayed against the nearest supertype, not the subtype.</li>
+<li>Sample population uniqueness errors do not need to display on the object type shape. Display on the fact type shape is sufficient.</li>
+<li>Double clicking a role with an active error activates that error and the first error listed for the fact type, which might differ. The result is highly unpredictable.</li>
+<li>F2 does not activate the object name name field of a fact type shape displayed as an object type.</li>
+<li>Drawing code for displayed one-to-one link fact types continually asserts.</li>
+<li>Pressing delete while renaming in a diagram tab deletes the current selection on the diagram.</li>
+<li>The diagram reorder dialog (part of the Diagram Management extension) should initially select the current diagram.</li>
+<li>Dragging fact type shapes off the model browser creates multiple identical role name and value constraint name shapes.</li>
+<li>Modality needs to be considered when validating the intersection of single column subset constraints and simple mandatory constraints (fix targeted to subset constraints).</li>
+<li>Cross-model drag of a fact type with multiple readings on a single order fails to cleanly undo. Drag/Undo/Repeat drag fails the second drag.</li>
+<li>Cross-model drag crashes for unary objectifications with matching object type names but non-matching fact type signatures.</li>
+<li>Redo diagram deletion where the diagram contains multiple shapes for a single item crashes hard.</li>
+<li>Double-click of a subtype line connected to a subset constraint cancels the constraint edit. Double click should common on the constrained subtype.</li>
+</ol>
+</li>
+</ul>
+<hr/>
+</div>
+<h2><span class="toggle" onclick="toggleDisp(this,'oldChanges')">+</span>Previous Releases</h2>
+<div style="display:none;" id="oldChanges">
+<h3><span class="toggle" onclick="toggleDisp(this,'dec2013')">+</span>December 2013 CTP Changes</h3>
+<div style="display:none;" id="dec2013">
+<div>The December 2013 CTP release includes all modifications through changeset 1540.</div>
+<ul>
<li><a href="#ReadingSignatures 2013-12">Duplicate Reading Signature Validation</a> </li>
<li><a href="#ValueComparisonConstraint 2013-12">Value Comparison Constraints</a> </li>
<li><a href="#CardinalityConstraint 2013-12">Cardinality Constraints</a> </li>
@@ -111,8 +144,6 @@
</ul>
<hr/>
</div>
-<h2><span class="toggle" onclick="toggleDisp(this,'oldChanges')">+</span>Previous Releases</h2>
-<div style="display:none;" id="oldChanges">
<h3><span class="toggle" onclick="toggleDisp(this,'may2013')">+</span>May 2013 CTP Changes</h3>
<div style="display:none;" id="may2013">
<div>The May 2013 CTP release includes all modifications through changeset 1518.</div>
Modified: trunk/VersionGenerator.exe.config
===================================================================
--- trunk/VersionGenerator.exe.config 2015-01-02 06:08:27 UTC (rev 1557)
+++ trunk/VersionGenerator.exe.config 2015-01-08 02:17:32 UTC (rev 1558)
@@ -2,7 +2,7 @@
<configuration>
<appSettings>
<add key="RevisionStartYearMonth" value="2006-01"/>
- <add key="ReleaseYearMonth" value="2013-12"/>
+ <add key="ReleaseYearMonth" value="2015-01"/>
<add key="CountQuartersFromYearMonth" value="2011-01"/>
<!-- ReleaseType: "CTP" or "RTM" -->
<add key="ReleaseType" value="CTP"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mcu...@us...> - 2015-01-09 21:01:21
|
Revision: 1559
http://sourceforge.net/p/orm/code/1559
Author: mcurland
Date: 2015-01-09 21:01:18 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
Fix some verbalization crushes with difficult subquery scenarios by checking for null returns on all uses of GetRolePlayerVariableUse. Most of this is defensive: I don't have scenarios for all of these cases, but triggered one of these cases with a partial binding to an incomplete subquery definition.
Modified Paths:
--------------
trunk/ORMModel/ObjectModel/Verbalization.cs
trunk/Setup/Readme.htm
Modified: trunk/ORMModel/ObjectModel/Verbalization.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Verbalization.cs 2015-01-08 02:17:32 UTC (rev 1558)
+++ trunk/ORMModel/ObjectModel/Verbalization.cs 2015-01-09 21:01:18 UTC (rev 1559)
@@ -7984,7 +7984,8 @@
{
// Continue with another reading starting with the lead role of the
// preceding fact type.
- if (localContextLeadVariable == GetRolePlayerVariableUse(new RolePathNode(factTypeEntry, pathContext)).Value.PrimaryRolePlayerVariable)
+ RolePlayerVariableUse? entryVariableUse;
+ if (localContextLeadVariable == ((entryVariableUse = GetRolePlayerVariableUse(new RolePathNode(factTypeEntry, pathContext))).HasValue ? entryVariableUse.Value.PrimaryRolePlayerVariable : null))
{
// Optimization of next branch to test the entry variable without invoking the delegate
reading = factType.GetMatchingReading(readingOrders, null, entryRoleBase, null, null, MatchingReadingOptions.NoFrontText | MatchingReadingOptions.LeadRolesNotHyphenBound);
@@ -8810,7 +8811,8 @@
RolePlayerVariable newVariable = useMap[queryRoleKey].PrimaryRolePlayerVariable;
RolePlayerVariableUse correlatedUse = useMap[new RolePathNode(factTypeEntry, pathContext)];
object correlationRoot = correlatedUse.CorrelationRoot;
- foreach (RolePlayerVariable variable in (correlationRoot != null ? useMap[correlationRoot] : correlatedUse).GetCorrelatedVariables(true))
+ RolePlayerVariableUse rootCorrelatedUse;
+ foreach (RolePlayerVariable variable in (correlationRoot != null ? (useMap.TryGetValue(correlationRoot, out rootCorrelatedUse) ? rootCorrelatedUse : correlatedUse) : correlatedUse).GetCorrelatedVariables(true))
{
CustomCorrelateVariables(variable, newVariable);
}
@@ -11557,10 +11559,12 @@
int usePhase = CurrentQuantificationUsePhase;
object pathContext = node.PathContext;
RolePlayerVariableUse? resolvedChildVariableUse;
- if (testChildIndex >= childPathedRoles.Count || // Indicates a pure existential, we're here because the entry role can possibly be partnered.
- ((resolvedChildVariableUse = GetRolePlayerVariableUse(new RolePathNode(childPathedRoles[testChildIndex], pathContext))).HasValue && !resolvedChildVariableUse.Value.PrimaryRolePlayerVariable.HasBeenUsed(usePhase, true)))
+ RolePlayerVariableUse? entryVariableUse;
+ if ((testChildIndex >= childPathedRoles.Count || // Indicates a pure existential, we're here because the entry role can possibly be partnered.
+ ((resolvedChildVariableUse = GetRolePlayerVariableUse(new RolePathNode(childPathedRoles[testChildIndex], pathContext))).HasValue && !resolvedChildVariableUse.Value.PrimaryRolePlayerVariable.HasBeenUsed(usePhase, true))) &&
+ (entryVariableUse = GetRolePlayerVariableUse(new RolePathNode(entryPathedRole, pathContext))).HasValue)
{
- RolePlayerVariableUse variableUse = GetRolePlayerVariableUse(new RolePathNode(entryPathedRole, pathContext)).Value;
+ RolePlayerVariableUse variableUse = entryVariableUse.Value;
RolePlayerVariable primaryVariable = variableUse.PrimaryRolePlayerVariable;
object correlateWithKey = CorrelationRootToContextBoundKey(variableUse.CorrelationRoot, pathContext);
if (null == GetUnpairedPartnerVariable(
@@ -11625,6 +11629,7 @@
else
{
object correlationRoot = variableUse.CorrelationRoot;
+ RolePlayerVariableUse? rootVariableUse;
if (correlationRoot == null)
{
if (variableUse.CorrelatedVariablesHead != null)
@@ -11632,9 +11637,9 @@
partnerCorrelatedVariables = variableUse.GetCorrelatedVariables(false); // No reason to test the primary variable
}
}
- else
+ else if ((rootVariableUse = GetRolePlayerVariableUse(CorrelationRootToContextBoundKey(correlationRoot, pathContext))).HasValue)
{
- partnerCorrelatedVariables = GetRolePlayerVariableUse(CorrelationRootToContextBoundKey(correlationRoot, pathContext)).Value.GetCorrelatedVariables(true);
+ partnerCorrelatedVariables = rootVariableUse.Value.GetCorrelatedVariables(true);
}
if (partnerCorrelatedVariables != null)
{
@@ -11775,6 +11780,7 @@
return true;
}
object correlationRoot;
+ RolePlayerVariableUse? rootVariableUse;
if (variableUse.CorrelatedVariablesHead != null)
{
foreach (RolePlayerVariable testVariable in variableUse.GetCorrelatedVariables(false))
@@ -11785,9 +11791,10 @@
}
}
}
- else if (null != (correlationRoot = variableUse.CorrelationRoot))
+ else if (null != (correlationRoot = variableUse.CorrelationRoot) &&
+ (rootVariableUse = GetRolePlayerVariableUse(CorrelationRootToContextBoundKey(correlationRoot, pathContext))).HasValue)
{
- foreach (RolePlayerVariable testVariable in GetRolePlayerVariableUse(CorrelationRootToContextBoundKey(correlationRoot, pathContext)).Value.GetCorrelatedVariables(true))
+ foreach (RolePlayerVariable testVariable in rootVariableUse.Value.GetCorrelatedVariables(true))
{
if (testVariable == variable)
{
@@ -11976,12 +11983,19 @@
return true;
}
object correlationRootKey = CorrelationRootToContextBoundKey(variableUse.CorrelationRoot, pathContext);
- foreach (RolePlayerVariable correlatedVariable in (correlationRootKey != null) ? GetRolePlayerVariableUse(correlationRootKey).Value.GetCorrelatedVariables(true) : variableUse.GetCorrelatedVariables(false))
+ RolePlayerVariableUse? rootVariableUse;
+ IEnumerable<RolePlayerVariable> variableIter;
+ if (null != (variableIter = (correlationRootKey != null) ?
+ ((rootVariableUse = GetRolePlayerVariableUse(correlationRootKey)).HasValue ? rootVariableUse.Value.GetCorrelatedVariables(true): null) :
+ variableUse.GetCorrelatedVariables(false)))
{
- if (correlatedVariable != primaryVariable &&
- correlatedVariable.HasBeenUsed(quantificationUsePhase, true))
+ foreach (RolePlayerVariable correlatedVariable in variableIter)
{
- return true;
+ if (correlatedVariable != primaryVariable &&
+ correlatedVariable.HasBeenUsed(quantificationUsePhase, true))
+ {
+ return true;
+ }
}
}
Dictionary<RolePlayerVariable, LinkedNode<RolePlayerVariable>> customCorrelations;
Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm 2015-01-08 02:17:32 UTC (rev 1558)
+++ trunk/Setup/Readme.htm 2015-01-09 21:01:18 UTC (rev 1559)
@@ -72,7 +72,7 @@
<hr/>
<h2><span class="toggle" onclick="toggleDisp(this,'jan2015')">-</span>January 2015 CTP Changes</h2>
<div id="jan2015">
-<div>The January 2015 CTP release includes all modifications through changeset 1558. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
+<div>The January 2015 CTP release includes all modifications through changeset 1559. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
<ul>
<li>Feature Changes:
<ol>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mcu...@us...> - 2015-09-07 20:50:17
|
Revision: 1562
http://sourceforge.net/p/orm/code/1562
Author: mcurland
Date: 2015-09-07 20:50:14 +0000 (Mon, 07 Sep 2015)
Log Message:
-----------
Use VSIX installation with devenv /udateconfiguration for VS2012/2013/2015 Setup.sln
* Shows NORMA as an installed extension in VS
* /updateconfiguration will cause next VS launch to slow down and potentially file/new and opening the first .orm file. However, this is still much faster than devenv /setup, which has gotten significantly slower for each new VS version.
* Adjust vsix manifest editions for VS2013 and VS2015
Modified Paths:
--------------
trunk/Setup/Config.wxi
trunk/Setup/Product.wxs
trunk/Setup/Strings.wxl
trunk/Setup/UI/ErrorProgressText.wxs
trunk/VSIXInstall/VS2013/extension.vsixmanifest
trunk/VSIXInstall/VS2015/extension.vsixmanifest
Modified: trunk/Setup/Config.wxi
===================================================================
--- trunk/Setup/Config.wxi 2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/Config.wxi 2015-09-07 20:50:14 UTC (rev 1562)
@@ -70,9 +70,10 @@
<?define RootSuffixVersion="11.0"?>
<?define LinqSupport=1 ?>
<?define HelpFileTargetCollection="MS.VSIPCC.v110"?>
- <!--<?define VSIXInstall?>-->
+ <?define VSIXInstall?>
<?define VSRegistryPackageOnly?>
<?define NewORMFileViaNewFileItems?>
+ <!-- DoDevenvSetup modified by VSIXInstall, runs /updateconfiguration instead -->
<?define DoDevenvSetup?>
<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
<?define ModelingProjectSupport=1 ?>
@@ -81,9 +82,10 @@
<?define RootSuffixVersion="12.0"?>
<?define LinqSupport=1 ?>
<?define HelpFileTargetCollection="MS.VSIPCC.v120"?>
- <!--<?define VSIXInstall?>-->
+ <?define VSIXInstall?>
<?define VSRegistryPackageOnly?>
<?define NewORMFileViaNewFileItems?>
+ <!-- DoDevenvSetup modified by VSIXInstall, runs /updateconfiguration instead -->
<?define DoDevenvSetup?>
<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
<?define ModelingProjectSupport=1 ?>
@@ -92,9 +94,10 @@
<?define RootSuffixVersion="14.0"?>
<?define LinqSupport=1 ?>
<?define HelpFileTargetCollection="MS.VSIPCC.v140"?>
- <!--<?define VSIXInstall?>-->
+ <?define VSIXInstall?>
<?define VSRegistryPackageOnly?>
<?define NewORMFileViaNewFileItems?>
+ <!-- DoDevenvSetup modified by VSIXInstall, runs /updateconfiguration instead -->
<?define DoDevenvSetup?>
<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
<?define ModelingProjectSupport=1 ?>
Modified: trunk/Setup/Product.wxs
===================================================================
--- trunk/Setup/Product.wxs 2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/Product.wxs 2015-09-07 20:50:14 UTC (rev 1562)
@@ -135,7 +135,11 @@
</AdvertiseExecuteSequence>
<CustomAction Id="ArpInstallLocationCustomAction" Property="ARPINSTALLLOCATION" Value="[$(var.DefaultShortProductDir)]"/>
+ <?ifdef VSIXInstall?>
+ <CustomAction Id="DevEnvSetupCustomAction" Property="VSENVIRONMENTPATH" ExeCommand="$(var.RootSuffixCmd)/updateconfiguration" Return="ignore" Impersonate="no" Execute="commit"/>
+ <?else?>
<CustomAction Id="DevEnvSetupCustomAction" Property="VSENVIRONMENTPATH" ExeCommand="$(var.RootSuffixCmd)/Setup" Return="ignore" Impersonate="no" Execute="commit"/>
+ <?endif?>
<InstallExecuteSequence>
<RemoveExistingProducts Before="ArpInstallLocationCustomAction"/>
<Custom Before="InstallInitialize" Action="ArpInstallLocationCustomAction"/>
Modified: trunk/Setup/Strings.wxl
===================================================================
--- trunk/Setup/Strings.wxl 2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/Strings.wxl 2015-09-07 20:50:14 UTC (rev 1562)
@@ -65,6 +65,7 @@
<!-- HACK: DevEnvSetupCustomAction runs as a commit custom action, which makes it hard to show UI for it. -->
<!-- Instead, we hijack the ProgressTextRollbackCleanup string, since it is the last string normally shown before the custom action executes. -->
<String Id="ProgressTextRollbackCleanup">Running Visual Studio "/Setup" command. This may take several minutes...</String>
+ <String Id="ProgressTextRollbackCleanupVSIX">Running Visual Studio "/UpdateConfiguration" command.</String>
<String Id="ProgressTextExportTempHxDs">MSHelp2: Exporting temporary HxDs</String>
<String Id="ProgressTextRollbackHelpTransaction">MSHelp2: Rolling back transaction</String>
Modified: trunk/Setup/UI/ErrorProgressText.wxs
===================================================================
--- trunk/Setup/UI/ErrorProgressText.wxs 2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/UI/ErrorProgressText.wxs 2015-09-07 20:50:14 UTC (rev 1562)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi?>
<Fragment>
<UI Id="WixUI_ErrorProgressText">
<!-- action text -->
@@ -70,7 +71,11 @@
<ProgressText Action="MsiPublishAssemblies" Template="!(loc.ProgressTextMsiPublishAssembliesTemplate)">!(loc.ProgressTextMsiPublishAssemblies)</ProgressText>
<ProgressText Action="MsiUnpublishAssemblies" Template="!(loc.ProgressTextMsiUnpublishAssembliesTemplate)">!(loc.ProgressTextMsiUnpublishAssemblies)</ProgressText>
<ProgressText Action="Rollback" Template="!(loc.ProgressTextRollbackTemplate)">!(loc.ProgressTextRollback)</ProgressText>
- <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanup)</ProgressText>
+ <?ifdef VSIXInstall?>
+ <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanupVSIX)</ProgressText>
+ <?else?>
+ <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanup)</ProgressText>
+ <?endif?>
<ProgressText Action="UnmoveFiles" Template="!(loc.ProgressTextUnmoveFilesTemplate)">!(loc.ProgressTextUnmoveFiles)</ProgressText>
<ProgressText Action="UnpublishProduct">!(loc.ProgressTextUnpublishProduct)</ProgressText>
<!-- error text -->
Modified: trunk/VSIXInstall/VS2013/extension.vsixmanifest
===================================================================
--- trunk/VSIXInstall/VS2013/extension.vsixmanifest 2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/VSIXInstall/VS2013/extension.vsixmanifest 2015-09-07 20:50:14 UTC (rev 1562)
@@ -16,6 +16,7 @@
<Edition>Ultimate</Edition>
<Edition>Premium</Edition>
<Edition>Pro</Edition>
+ <Edition>Community</Edition>
</VisualStudio>
</SupportedProducts>
<SupportedFrameworkRuntimeEdition MinVersion="4.5" MaxVersion="4.5" />
Modified: trunk/VSIXInstall/VS2015/extension.vsixmanifest
===================================================================
--- trunk/VSIXInstall/VS2015/extension.vsixmanifest 2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/VSIXInstall/VS2015/extension.vsixmanifest 2015-09-07 20:50:14 UTC (rev 1562)
@@ -13,9 +13,9 @@
<InstalledByMsi>true</InstalledByMsi>
<SupportedProducts>
<VisualStudio Version="14.0">
- <Edition>Ultimate</Edition>
- <Edition>Premium</Edition>
+ <Edition>Enterprise</Edition>
<Edition>Pro</Edition>
+ <Edition>Community</Edition>
</VisualStudio>
</SupportedProducts>
<SupportedFrameworkRuntimeEdition MinVersion="4.6" MaxVersion="4.6" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mcu...@us...> - 2015-09-07 23:39:30
|
Revision: 1563
http://sourceforge.net/p/orm/code/1563
Author: mcurland
Date: 2015-09-07 23:39:27 +0000 (Mon, 07 Sep 2015)
Log Message:
-----------
Remove office icon dependencies
* Allows clean build on 2013 and 2015 without earlier VS versions
* Set version to September 2015. refs #193
Modified Paths:
--------------
trunk/ORMModel/ORMModel.csproj
trunk/ORMModel/Shell/PackageResources/PkgCmd.vsct
trunk/Setup/Readme.htm
trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
trunk/VersionGenerator.exe.config
Added Paths:
-----------
trunk/ORMModel/Resources/Commands.ImageStrip.png
Modified: trunk/ORMModel/ORMModel.csproj
===================================================================
--- trunk/ORMModel/ORMModel.csproj 2015-09-07 20:50:14 UTC (rev 1562)
+++ trunk/ORMModel/ORMModel.csproj 2015-09-07 23:39:27 UTC (rev 1563)
@@ -663,6 +663,7 @@
<None Include="Resources\Toolbox.ModelNoteConnector.Bitmap.Id.bmp" />
<Content Include="ObjectModel\VerbalizationReportGenerator.xslt" />
<Content Include="ObjectModel\VerbalizationReportSnippets\VerbalizationReportSnippets.xml" />
+ <None Include="Resources\Commands.ImageStrip.png" />
<Content Include="Resources\ResourceStringsGenerator.xml">
<Generator>NUPlixLoader</Generator>
<LastGenOutput>ResourceStringsGenerator.cs</LastGenOutput>
Added: trunk/ORMModel/Resources/Commands.ImageStrip.png
===================================================================
(Binary files differ)
Index: trunk/ORMModel/Resources/Commands.ImageStrip.png
===================================================================
--- trunk/ORMModel/Resources/Commands.ImageStrip.png 2015-09-07 20:50:14 UTC (rev 1562)
+++ trunk/ORMModel/Resources/Commands.ImageStrip.png 2015-09-07 23:39:27 UTC (rev 1563)
Property changes on: trunk/ORMModel/Resources/Commands.ImageStrip.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/ORMModel/Shell/PackageResources/PkgCmd.vsct
===================================================================
--- trunk/ORMModel/Shell/PackageResources/PkgCmd.vsct 2015-09-07 20:50:14 UTC (rev 1562)
+++ trunk/ORMModel/Shell/PackageResources/PkgCmd.vsct 2015-09-07 23:39:27 UTC (rev 1563)
@@ -336,7 +336,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdMoveRoleSequenceUp" priority="0x0060" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdConstraintEditContext"/>
- <Icon guid="guidOfficeIcon" id="msotcidUpArrow2"/>
+ <Icon guid="guidCommandIcons" id="bmpIdUpArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -345,7 +345,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdMoveRoleSequenceDown" priority="0x0070" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdConstraintEditContext"/>
- <Icon guid="guidOfficeIcon" id="msotcidDownArrow2"/>
+ <Icon guid="guidCommandIcons" id="bmpIdDownArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -534,7 +534,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdReadingEditorDeleteReading" priority="0x0730" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdReadingEditorContextAddDelete"/>
- <Icon guid="guidOfficeIcon" id="msotcidDelete"/>
+ <Icon guid="guidCommandIcons" id="bmpIdDelete"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -543,7 +543,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdReadingEditorPromoteReading" priority="0x0740" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdReadingEditorContextReadingPromoteDemote"/>
- <Icon guid="guidOfficeIcon" id="msotcidUpArrow2"/>
+ <Icon guid="guidCommandIcons" id="bmpIdUpArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -552,7 +552,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdReadingEditorDemoteReading" priority="0x0750" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdReadingEditorContextReadingPromoteDemote"/>
- <Icon guid="guidOfficeIcon" id="msotcidDownArrow2"/>
+ <Icon guid="guidCommandIcons" id="bmpIdDownArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -561,7 +561,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdReadingEditorPromoteReadingOrder" priority="0x0760" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdReadingEditorContextOrderPromoteDemote"/>
- <Icon guid="guidOfficeIcon" id="msotcidUpArrow2"/>
+ <Icon guid="guidCommandIcons" id="bmpIdUpArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -570,7 +570,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdReadingEditorDemoteReadingOrder" priority="0x0770" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdReadingEditorContextOrderPromoteDemote"/>
- <Icon guid="guidOfficeIcon" id="msotcidDownArrow2"/>
+ <Icon guid="guidCommandIcons" id="bmpIdDownArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -692,7 +692,7 @@
<Button guid="guidORMDesignerCommandSet" id="cmdIdCopyImage" priority="0x0200" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdModelCommands"/>
- <Icon guid="guidOfficeIcon" id="msotcidCamera"/>
+ <Icon guid="guidCommandIcons" id="bmpIdCamera"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -726,7 +726,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdInsertRoleAfter" priority="0x030" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdRoleCommands"/>
- <Icon guid="guidOfficeIcon" id="msotcidShapeRightArrow"/>
+ <Icon guid="guidCommandIcons" id="bmpIdRightArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -735,7 +735,7 @@
</Button>
<Button guid="guidORMDesignerCommandSet" id="cmdIdInsertRoleBefore" priority="0x040" type="Button">
<Parent guid="guidORMDesignerCommandSet" id="groupIdRoleCommands"/>
- <Icon guid="guidOfficeIcon" id="msotcidShapeLeftArrow"/>
+ <Icon guid="guidCommandIcons" id="bmpIdLeftArrow"/>
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
@@ -986,6 +986,7 @@
<Bitmaps>
<Bitmap guid="guidORMVerbalizationToolbarImages" href="../../Resources/VerbalizationToolbarImages.png" usedList="bmpIdShowNegativeVerbalization, bmpIdShowPositiveVerbalization, bmpIdVerbalizationHyperlinkToDiagramSpy"/>
<Bitmap guid="guidORMToolWindowIcons" href="../../Resources/ToolWindowIcons.png" usedList="bmpIdToolWindowVerbalizationBrowser, bmpIdToolWindowReadingEditor, bmpIdToolWindowReferenceModeEditor, bmpIdToolWindowFactEditor, bmpIdToolWindowModelBrowser, bmpIdToolWindowNotesEditor, bmpIdToolWindowPopulationEditor, bmpIdToolWindowContextWindow, bmpIdToolWindowDescriptionEditor, bmpIdToolWindowDiagramSpy"/>
+ <Bitmap guid="guidCommandIcons" href="../../Resources/Commands.ImageStrip.png" usedList="bmpIdDelete, bmpIdCamera, bmpIdUpArrow, bmpIdDownArrow, bmpIdLeftArrow, bmpIdRightArrow"/>
</Bitmaps>
</Commands>
@@ -1308,14 +1309,13 @@
<IDSymbol value="Extern" name="cmdidPropertiesWindow"/>
</GuidSymbol>
<GuidSymbol name="CMDSETID_StandardCommandSet2K" value="Extern"/>
- <GuidSymbol name="guidOfficeIcon" value="Extern">
- <IDSymbol value="Extern" name="msotcidNoIcon"/>
- <IDSymbol value="Extern" name="msotcidDelete"/>
- <IDSymbol value="Extern" name="msotcidUpArrow2"/>
- <IDSymbol value="Extern" name="msotcidDownArrow2"/>
- <IDSymbol value="Extern" name="msotcidShapeLeftArrow"/>
- <IDSymbol value="Extern" name="msotcidShapeRightArrow"/>
- <IDSymbol value="Extern" name="msotcidCamera"/>
+ <GuidSymbol name="guidCommandIcons" value="{E590BC32-4910-429C-BFA7-24EB2FD63E0D}">
+ <IDSymbol value="0x0001" name="bmpIdDelete"/>
+ <IDSymbol value="0x0002" name="bmpIdCamera"/>
+ <IDSymbol value="0x0003" name="bmpIdUpArrow"/>
+ <IDSymbol value="0x0004" name="bmpIdDownArrow"/>
+ <IDSymbol value="0x0005" name="bmpIdLeftArrow"/>
+ <IDSymbol value="0x0006" name="bmpIdRightArrow"/>
</GuidSymbol>
</Symbols>
</CommandTable>
Modified: trunk/Setup/Readme.htm
===================================================================
--- trunk/Setup/Readme.htm 2015-09-07 20:50:14 UTC (rev 1562)
+++ trunk/Setup/Readme.htm 2015-09-07 23:39:27 UTC (rev 1563)
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
-<title>NORMA January 2015 CTP Readme</title>
+<title>NORMA September 2015 CTP Readme</title>
<style type="text/css">
.new {font-size:x-small; background-color:Gold; color:Blue; }
.toggle{font-size:larger;cursor:pointer;font-family: monospace; color:rgb(97, 133, 160); display:inline; padding-right:.15em;}
@@ -35,9 +35,9 @@
<body>
-<p><b><a id="The Top" style="font-family:Verdana;font-size:medium">NORMA January 2015 CTP Readme</a> </b></p>
+<p><b><a id="The Top" style="font-family:Verdana;font-size:medium">NORMA September 2015 CTP Readme</a> </b></p>
<p>This file supersedes the previous readme.txt and older readme.htm files. This readme has parallel indexing mechanisms: by topic, and by release date (starting with the October 2008 (2008-10) release). The file will be extended for future product releases.<br/><br/>
-The January 2015 is primarily a bug fix release. Support has also been added for import from an Oracle database. See detailed change notes below for specifics.<br/><br/>
+The September 2015 release adds support for Visual Studio 2015. See detailed change notes below for specifics.<br/><br/>
</p>
<h2><span class="toggle" onclick="toggleDisp(this,'contents')">-</span>Contents</h2>
<div id="contents">
@@ -70,12 +70,32 @@
</div>-->
<hr/>
-<h2><span class="toggle" onclick="toggleDisp(this,'jan2015')">-</span>January 2015 CTP Changes</h2>
-<div id="jan2015">
-<div>The January 2015 CTP release includes all modifications through changeset 1559. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a> (be patient with this link, the page contains a full changeset history).</div>
+<h2><span class="toggle" onclick="toggleDisp(this,'sep2015')">-</span>September 2015 CTP Changes</h2>
+<div id="sep2015">
+<div>The September 2015 CTP release includes all modifications through changeset 1563. Full changeset descriptions can be found at the <a href="http://orm.svn.sourceforge.net/viewvc/orm/trunk/?view=log">sourceforge code repository</a>.</div>
<ul>
<li>Feature Changes:
<ol>
+<li>Added support for Visual Studio 2015.</li>
+<li>Modified setup behavior to not use devenv /setup. NORMA now installs as a Visual Studio extension for version at or above VS2010. Setup will be much faster, but some slowdowns are expected when launching Visual Studio the first time after installation.</li>
+</ol>
+</li>
+<li>Bug Fixes:
+<ol>
+<li>Removed all dependencies on Office icons, which are not available after VS2013 and displayed inconsistently in earlier releases. Development builds will now complete for VS2013 and VS2015 on machines without earlier Visual Studio installations.</li>
+</ol>
+</li>
+</ul>
+<hr/>
+</div>
+<h2><span class="toggle" onclick="toggleDisp(this,'oldChanges')">+</span>Previous Releases</h2>
+<div style="display:none;" id="oldChanges">
+<h3><span class="toggle" onclick="toggleDisp(this,'jan2015')">+</span>January 2015 CTP Changes</h3>
+<div style="display:none" id="jan2015">
+<div>The January 2015 CTP release includes all modifications through changeset 1559.</div>
+<ul>
+<li>Feature Changes:
+<ol>
<li>Added database import support for Oracle using the ODAC drivers (thanks to Jose Carlus).</li>
<li>Data type verbalization now shows the scale/length/precision of a data type if these values are set.</li>
<li>Allow the sample population editor to display recursive identifiers. Note that this will still crash other parts of the system (like relational generation), but can at least be viewed conceptually. The use of a surrogate identifier is recommended in this case.</li>
@@ -101,8 +121,6 @@
</ul>
<hr/>
</div>
-<h2><span class="toggle" onclick="toggleDisp(this,'oldChanges')">+</span>Previous Releases</h2>
-<div style="display:none;" id="oldChanges">
<h3><span class="toggle" onclick="toggleDisp(this,'dec2013')">+</span>December 2013 CTP Changes</h3>
<div style="display:none;" id="dec2013">
<div>The December 2013 CTP release includes all modifications through changeset 1540.</div>
@@ -584,8 +602,9 @@
<hr />
<h3><a id="Setup">Installing NORMA</a></h3>
<ol>
-<li>Updating NORMA to the latest version requires Setup.bat to be run from the downloaded .zip file, which should be chosen based on whether you want to install for Visual Studio 2010, Visual Studio 2008, or Visual Studio 2005. NORMA does not share installation files between these two products, so you must choose your target when you download the installation package.</li>
-<li>Any previous NORMA versions and any dependencies will be automatically uninstalled and reinstalled by the Setup.bat file. Make sure Visual Studio is not running during the installation pocess. Please be patient with the uninstall, which takes roughly the same amount of time as the install. Killing installation processes (the setup command prompt, msiexec, devenv) can leave you with a system that requires manual intervention to restore.</li>
+<li>Updating NORMA to the latest version requires Setup.bat to be run from the downloaded .zip file, which should be chosen based on your Visual Studio version (2015, 2013, 2012, 2010, 2008, 2005). NORMA does not share installation files between versions, so you must choose your target when you download the installation package.</li>
+<li>Any previous NORMA versions for the selected Visual Studio target will be automatically uninstalled and reinstalled by the Setup.bat file. Make sure Visual Studio is not running during the installation pocess. Please be patient with the uninstall, which takes roughly the same amount of time as the install. Killing installation processes (the setup command prompt, msiexec, devenv) can leave you with a system that requires manual intervention to restore.</li>
+<li>Full Visual Studio studio configuration on version 2010 and higher will not be completed until after Visual Studio has restarted. Some slowdown should be expected on Visual Studio launch, the first time the 'File/New' dialog is opened, and the first time an .orm file is opened.</li>
<li>First extract the files from the .zip file first unless you open them with the standard 'Compressed (zipped) Folders' viewer, in which case you can usually run Setup.bat without pre-expanding the zip file. Vista is likely to recommend expansion even with the standard viewer.</li>
<li><a id="#Setup 2008-10" class="new" title="October 2008 CTP: SetupVistaOrLater.bat elevates install permissions on Vista, Windows7, and later operating systems.">2008-10</a>
The setup process must be run with admistrative permissions on Vista, Windows7, and later operating systems. You can either right-click the Setup.bat file and choose 'Run as Administrator', or you can run SetupVistaOrLater.bat instead of Setup.bat and agree to the security warnings. [Note that SetupVistaOrLater.bat relies on a system where a .js extension is treated as an executable scripting file. Some other products (especially some from Adobe) may override this default system setting. If SetupVistaOrLater.bat does not appear to do anything, then explicitly run Setup.bat as an administrator.]</li>
Modified: trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
===================================================================
--- trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets 2015-09-07 20:50:14 UTC (rev 1562)
+++ trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets 2015-09-07 23:39:27 UTC (rev 1563)
@@ -55,6 +55,9 @@
<PropertyGroup>
<!-- If we are building for Visual Studio 9.0, use VSCT v3.5, otherwise use VSCT v2.0. -->
+ <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v14.0'">10.0.0.0</VsctAssemblyVersion>
+ <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v12.0'">10.0.0.0</VsctAssemblyVersion>
+ <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v11.0'">10.0.0.0</VsctAssemblyVersion>
<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v10.0'">10.0.0.0</VsctAssemblyVersion>
<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v9.0'">3.5.0.0</VsctAssemblyVersion>
<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'==''">2.0.0.0</VsctAssemblyVersion>
@@ -93,7 +96,7 @@
<VSCTCompiler
NoLogo="true"
IntermediateDirectory="$(MSBuildProjectDirectory)\$(IntermediateOutputPath)"
- AdditionalIncludeDirectories="$(VsctIncludesDirs);$(VsSDKIncludesDir);$(VsSDKIncludesDir)\office10"
+ AdditionalIncludeDirectories="$(VsctIncludesDirs);$(VsSDKIncludesDir)"
Definitions="$(DefineConstants)"
Source="@(CompileVsct)"
OutputFile="%(FileName).cto"
Modified: trunk/VersionGenerator.exe.config
===================================================================
--- trunk/VersionGenerator.exe.config 2015-09-07 20:50:14 UTC (rev 1562)
+++ trunk/VersionGenerator.exe.config 2015-09-07 23:39:27 UTC (rev 1563)
@@ -2,7 +2,7 @@
<configuration>
<appSettings>
<add key="RevisionStartYearMonth" value="2006-01"/>
- <add key="ReleaseYearMonth" value="2015-08"/>
+ <add key="ReleaseYearMonth" value="2015-09"/>
<add key="CountQuartersFromYearMonth" value="2011-01"/>
<!-- ReleaseType: "CTP" or "RTM" -->
<add key="ReleaseType" value="CTP"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mcu...@us...> - 2016-01-30 09:32:47
|
Revision: 1564
http://sourceforge.net/p/orm/code/1564
Author: mcurland
Date: 2016-01-30 09:32:44 +0000 (Sat, 30 Jan 2016)
Log Message:
-----------
* Fix build issues on standalone VS2015 machine
* Remove extra predefinedDataType line from DCIL generator
Modified Paths:
--------------
trunk/README.txt
trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
trunk/VS2015.bat
trunk/VSIXInstall/VS2012/Readme.txt
trunk/VSIXInstall/VS2013/Readme.txt
trunk/VSIXInstall/VS2015/Readme.txt
trunk/XML/ConceptualDBtoDCIL/ConceptualDBtoDCIL.xslt
Added Paths:
-----------
trunk/ORMPackage.VS2015.sln
Added: trunk/ORMPackage.VS2015.sln
===================================================================
(Binary files differ)
Index: trunk/ORMPackage.VS2015.sln
===================================================================
--- trunk/ORMPackage.VS2015.sln 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/ORMPackage.VS2015.sln 2016-01-30 09:32:44 UTC (rev 1564)
Property changes on: trunk/ORMPackage.VS2015.sln
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/README.txt 2016-01-30 09:32:44 UTC (rev 1564)
@@ -80,13 +80,15 @@
Notes on building and debugging with VS2008 through VS2015:
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. 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, 2013, and 2015 work similarly.
+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 registry information 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, 2013, and 2015 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.
+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
+VS2015 builds are exhibiting an additional issue where the VSCT.exe file used during the build cannot load VSCTCompress.dll. The only current solution for this is to include the directory containing this file on your path. With the Visual Studio SDK installed you should have an environment variable call VSSDK140Install. The VSCT directory is %VSSDK140Install%\VisualStudioIntegration\Tools\Bin. The VS2015.bat file has been extended to automatically extend the path in your local command prompt as needed (be sure to run as an admin or the batch file will not complete).
+
To build from the command line for VS2008:
1) Open a 'Visual Studio 2008 Command Prompt'
2) Navigate to your NORMA root code directory
Modified: trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets
===================================================================
--- trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/Tools/NUBuildVS/Neumont.Build.VisualStudio.targets 2016-01-30 09:32:44 UTC (rev 1564)
@@ -55,9 +55,9 @@
<PropertyGroup>
<!-- If we are building for Visual Studio 9.0, use VSCT v3.5, otherwise use VSCT v2.0. -->
- <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v14.0'">10.0.0.0</VsctAssemblyVersion>
- <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v12.0'">10.0.0.0</VsctAssemblyVersion>
- <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v11.0'">10.0.0.0</VsctAssemblyVersion>
+ <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v14.0'">14.0.0.0</VsctAssemblyVersion>
+ <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v12.0'">12.0.0.0</VsctAssemblyVersion>
+ <VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v11.0'">11.0.0.0</VsctAssemblyVersion>
<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v10.0'">10.0.0.0</VsctAssemblyVersion>
<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'=='' and '$(TargetVisualStudioVersion)'=='v9.0'">3.5.0.0</VsctAssemblyVersion>
<VsctAssemblyVersion Condition="'$(VsctAssemblyVersion)'==''">2.0.0.0</VsctAssemblyVersion>
Modified: trunk/VS2015.bat
===================================================================
--- trunk/VS2015.bat 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VS2015.bat 2016-01-30 09:32:44 UTC (rev 1564)
@@ -1 +1,23 @@
@CALL "%~dp0VSVer.bat" 2015
+
+@ECHO OFF
+::Add SDK tools to path if vsct cannot be found, fails to compile in VS2015 otherwise
+set SDKVSCT=
+for %%i in (vsct.exe) do (set EXISTINGVSCT=%%~s$PATH:i)
+if '%EXISTINGVSCT%'=='' (
+ CALL:GETSHORTPATH "SDKVSCT" "%VSSDK140INSTALL%\VisualStudioIntegration\Tools\Bin"
+)
+if NOT '%SDKVSCT%'=='' (
+ CALL:EXTENDPATH "%SDKVSCT%"
+)
+SET FOUNDVSCT=
+SET SDKVSCT=
+goto:EOF
+
+:GETSHORTPATH
+SET %~1=%~s2
+GOTO:EOF
+
+:EXTENDPATH
+SET PATH=%PATH%;%~1
+GOTO:EOF
Modified: trunk/VSIXInstall/VS2012/Readme.txt
===================================================================
--- trunk/VSIXInstall/VS2012/Readme.txt 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VSIXInstall/VS2012/Readme.txt 2016-01-30 09:32:44 UTC (rev 1564)
@@ -8,7 +8,7 @@
If menu or other packages changes are made and VS2012 does not recognize them, then the .vsixmanifest file can be modified in place as follows:
1) Shut down VS2012 Experimental Hive
-2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\10.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
+2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\11.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
3) Change the contents of the <InstalledByMsi> tag from true to false (this enables you to disable the extension below).
4) Delete any .cache files you find in the Extensions directory (three directories above the directory with the manifest file).
5) Relaunch VS2012 Experimental Hive (devenv /RootSuffix Exp) and open the Tools/Extension Manager dialog.
Modified: trunk/VSIXInstall/VS2013/Readme.txt
===================================================================
--- trunk/VSIXInstall/VS2013/Readme.txt 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VSIXInstall/VS2013/Readme.txt 2016-01-30 09:32:44 UTC (rev 1564)
@@ -8,7 +8,7 @@
If menu or other packages changes are made and VS2013 does not recognize them, then the .vsixmanifest file can be modified in place as follows:
1) Shut down VS2013 Experimental Hive
-2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\10.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
+2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\12.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
3) Change the contents of the <InstalledByMsi> tag from true to false (this enables you to disable the extension below).
4) Delete any .cache files you find in the Extensions directory (three directories above the directory with the manifest file).
5) Relaunch VS2013 Experimental Hive (devenv /RootSuffix Exp) and open the Tools/Extension Manager dialog.
Modified: trunk/VSIXInstall/VS2015/Readme.txt
===================================================================
--- trunk/VSIXInstall/VS2015/Readme.txt 2015-09-07 23:39:27 UTC (rev 1563)
+++ trunk/VSIXInstall/VS2015/Readme.txt 2016-01-30 09:32:44 UTC (rev 1564)
@@ -8,7 +8,7 @@
If menu or other packages changes are made and VS2015 does not recognize them, then the .vsixmanifest file can be modified in place as follows:
1) Shut down VS2015 Experimental Hive
-2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\10.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
+2) Find the vsix install location for the package. Starting from the directory in the LocalAppData environment variable (or "%userprofile%\Local Settings\Application Data" if LocalAppData is not set), find the extension.vsixmanifest file in "Microsoft\VisualStudio\14.0Exp\Extensions\ORM Solutions\Natural ORM Architect\1.0".
3) Change the contents of the <InstalledByMsi> tag from true to false (this enables you to disable the extension below).
4) Delete any .cache files you find in the Extensions directory (three directories above the directory with the manifest file).
5) Relaunch VS2015 Experimental Hive (devenv /RootSuffix Exp) and open the Tools/Extension Manager dialog.
Modified: trunk/XML/ConceptualDBtoDCIL/ConceptualDBtoDCIL.xslt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X