Master

BuildTestsVS2015.bat

@@ -0,0 +1,11 @@
+@ECHO OFF
+SETLOCAL
+
+IF "%TargetVisualStudioVersion%"=="v8.0" (
+	SET DegradeToolsVersion=/toolsversion:2.0
+) ELSE (
+	SET TargetVisualStudioVersion=v9.0
+	SET DegradeToolsVersion=/toolsversion:3.5
+)
+
+CALL "%~dp0BuildTests.bat" %* /consoleloggerparameters:DisableMPLogging %DegradeToolsVersion%

CustomProperties/GeneratedCode/DomainModelResx.VS2010.cs

@@ -0,0 +1 @@
+ErrorGeneratingOutput

CustomProperties/GeneratedCode/DomainModelResx.cs

@@ -0,0 +1 @@
+ErrorGeneratingOutput

Neumont.Build.VisualStudio.targets

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	Neumont Build System
+
+	Copyright © Neumont University. All rights reserved.
+
+	This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+	Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+	1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+	2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+	3. This notice may not be removed or altered from any source distribution.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<!--
+		This .targets file provides various tasks and targets related to extending Microsoft® Visual Studio®.
+		It should be imported after Microsoft.Common.targets is imported.
+		(Note: Microsoft.Common.targets is typically imported indirectly via language-specific .targets files, such as Microsoft.CSharp.targets or Microsoft.VisualBasic.targets.)
+	-->
+
+	<PropertyGroup>
+		 <!-- The name of the assembly that contains the NUBuildVS tasks. -->
+		<NUBuildVSTasksAssemblyName>Neumont.Build.VisualStudio$(ProjectToolsAssemblySuffix), Version=$(ProjectToolsAssemblyVersion), Culture=neutral, PublicKeyToken=957d5b7d5e79e25f</NUBuildVSTasksAssemblyName>
+	</PropertyGroup>
+
+	<UsingTask TaskName="VsSdkLocator" AssemblyName="$(NUBuildVSTasksAssemblyName)"/>
+
+
+	<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.targets')">
+		 <!-- This forces a rebuild of a project if it references this targets file and this targets file changes. -->
+		<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildExtensionsPath)\Neumont\VisualStudio\Neumont.Build.VisualStudio.targets</MSBuildAllProjects>
+	</PropertyGroup>
+
+
+	<!-- Retrieves the location of various Visual Studio SDK directories and tools. -->
+	<PropertyGroup>
+		<LocateVisualStudioSDKDependsOn>
+			$(LocateVisualStudioSDKDependsOn)
+		</LocateVisualStudioSDKDependsOn>
+	</PropertyGroup>
+
+	<Target
+		Name="LocateVisualStudioSDK"
+		DependsOnTargets="$(LocateVisualStudioSDKDependsOn)">
+
+		<VsSdkLocator RequestedVersion="$(TargetVisualStudioVersion)">
+			<Output TaskParameter="InstallationDirectory" PropertyName="VsSDKInstallationDir"/>
+			<Output TaskParameter="ToolsDirectory" PropertyName="VsSDKToolsDir"/>
+			<Output TaskParameter="IncludesDirectory" PropertyName="VsSDKIncludesDir"/>
+			<Output TaskParameter="RedistributablesDirectory" PropertyName="VsSDKRedistributablesDir"/>
+		</VsSdkLocator>
+
+	</Target>
+
+
+	<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'">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>
+	</PropertyGroup>
+
+	<!-- Compiles .vsct files into .cto files. -->
+	<UsingTask TaskName="VSCTCompiler" AssemblyName="VSCT, Version=$(VsctAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+	<ItemGroup>
+		<!-- Add the CompileVsct Item name to the AvailableItemName item, so that it shows up in the Build Action drop-down menu in the properties windows in Visual Studio (and the equivalent in other IDEs). -->
+		<AvailableItemName Include="CompileVsct"/>
+	</ItemGroup>
+
+	<PropertyGroup>
+		<VsctCompileDependsOn>
+			$(VsctCompileDependsOn);
+			LocateVisualStudioSDK
+		</VsctCompileDependsOn>
+		<MergeResourcesDependsOn>
+			$(MergeResourcesDependsOn);
+			VsctCompile
+		</MergeResourcesDependsOn>
+		<ResGenDependsOn>
+			$(ResGenDependsOn);
+			VsctCompile
+		</ResGenDependsOn>
+
+		<VsctIncludesDirs>$(VsctIncludesDirs)</VsctIncludesDirs>
+	</PropertyGroup>
+
+	<Target
+		Name="VsctCompile"
+		DependsOnTargets="$(VsctCompileDependsOn)"
+		Condition="'@(CompileVsct)'!=''">
+
+		<!-- We need to include the $(MSBuildProjectDirectory) in the IntermediateDirectory below because the VSCT compiler changes the current directory while it is running. -->
+		<VSCTCompiler
+			NoLogo="true"
+			IntermediateDirectory="$(MSBuildProjectDirectory)\$(IntermediateOutputPath)"
+			AdditionalIncludeDirectories="$(VsctIncludesDirs);$(VsSDKIncludesDir)"
+			Definitions="$(DefineConstants)"
+			Source="@(CompileVsct)"
+			OutputFile="%(FileName).cto"
+		/>
+
+		<!-- Add the generated .cto file to FileWrites and MergeResources. -->
+		<!-- NOTE: @(CompileVsct) is expected to already have the MergeTarget and ResourceName metadata values specified. -->
+		<CreateItem Include="@(CompileVsct->'$(IntermediateOutputPath)%(FileName).cto')" Condition="Exists('@(CompileVsct->'$(IntermediateOutputPath)%(FileName).cto')')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+			<Output TaskParameter="Include" ItemName="MergeResource"/>
+		</CreateItem>
+
+		<!-- The VSCT compiler uses these files for tracking its dependencies, so we need to include them in FileWrites. -->
+		<CreateItem Include="$(IntermediateOutputPath)VSCT.read.1.tlog" Condition="Exists('$(IntermediateOutputPath)VSCT.read.1.tlog')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
+		<CreateItem Include="$(IntermediateOutputPath)VSCT.write.1.tlog" Condition="Exists('$(IntermediateOutputPath)VSCT.write.1.tlog')">
+			<Output TaskParameter="Include" ItemName="FileWrites"/>
+		</CreateItem>
+
+	</Target>
+
+
+</Project>

ORM2CommandLineTest/App.config

@@ -1,16 +1,14 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <configuration>
 	<configSections>
-  <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-   <section name="ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </sectionGroup>
-  <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-   <section name="ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-  </sectionGroup>
- </configSections>
- <startup>
-		<supportedRuntime version="v2.0.50727" safemode="true"/>
-		<requiredRuntime version="v2.0.50727" safemode="true"/>
+		<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+			<section name="ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+		</sectionGroup>
+		<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+			<section name="ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+		</sectionGroup>
+	</configSections>
+	<startup>
 	</startup>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -30,21 +28,21 @@
 			<ipv6 enabled="true"/>
 		</settings>
 	</system.net>
- <applicationSettings>
-  <ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
-   <setting name="VisualStudioVersion" serializeAs="String">
-    <value>8.0</value>
-   </setting>
-  </ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
- </applicationSettings>
- <userSettings>
-  <ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
-   <setting name="DiffProgram" serializeAs="String">
-    <value>C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\Bin\WinDiff.exe</value>
-   </setting>
-   <setting name="DllMapping" serializeAs="String">
-    <value />
-   </setting>
-  </ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
- </userSettings>
+	<applicationSettings>
+		<ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
+			<setting name="VisualStudioVersion" serializeAs="String">
+				<value>8.0</value>
+			</setting>
+		</ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
+	</applicationSettings>
+	<userSettings>
+		<ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
+			<setting name="DiffProgram" serializeAs="String">
+				<value>C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\Bin\WinDiff.exe</value>
+			</setting>
+			<setting name="DllMapping" serializeAs="String">
+				<value/>
+			</setting>
+		</ORMSolutions.ORMArchitectSDK.TestReportViewer.Settings>
+	</userSettings>
 </configuration>

ORM2CommandLineTest/ReportViewer.csproj

@@ -1,4 +1,5 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" 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>
@@ -11,6 +12,26 @@
     <RootNamespace>ORMSolutions.ORMArchitectSDK.TestReportViewer</RootNamespace>
     <AssemblyName>ORMTestReportViewer.$(TargetVisualStudioShortProductName)</AssemblyName>
     <StartupObject>ORMSolutions.ORMArchitectSDK.TestReportViewer.Program</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,9 +61,12 @@
     <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk, Version=$(TargetDslToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.Diagrams, Version=$(TargetDslToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.Utilities, Version=$(TargetDslToolsAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.Diagrams.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.DslDefinition.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Modeling.SDK.Integration.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Modeling.SDK.Integration.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -56,9 +80,13 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="xmldiffpatch, Version=1.0.8.28, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(ProgramFiles)\XmlDiffPatch\Bin\xmldiffpatch.dll</HintPath>
+    <Reference Include="XmlDiffPatch, Version=1.0.8.28, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\XMLDiffPatch.1.0.8.28\lib\net\XmlDiffPatch.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XmlDiffPatch.View, Version=1.0.1493.40755, Culture=neutral">
+      <HintPath>..\packages\XMLDiffPatch.1.0.8.28\lib\net\XmlDiffPatch.View.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -104,6 +132,7 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -132,6 +161,18 @@
     <Content Include="ChangeMapping.xslt" />
     <EmbeddedResource Include="Glasses.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Neumont\Neumont.Build.targets" />
   <PropertyGroup>

ORM2CommandLineTest/ReportViewer.csproj.user

@@ -1,6 +1,15 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
+    <PublishUrlHistory />
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <StartAction>Program</StartAction>