Menu
▾
▴
SF.net SVN: orm:[1547] trunk
|
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.
|
