Permalink
Browse files

Fixed confusion btw Project and Solution configurations

  • Loading branch information...
erikbra committed Oct 25, 2017
1 parent 2589799 commit 06c9736f78df08382c6e1f7aa5212ad0b3264e55
Showing with 84 additions and 251 deletions.
  1. +3 −3 build.ps1
  2. +3 −1 product/roundhouse.console/Properties/AssemblyInfo.cs
  3. +5 −20 product/roundhouse.console/roundhouse.console.csproj
  4. +1 −0 product/roundhouse.databases.access/Properties/AssemblyInfo.cs
  5. +4 −19 product/roundhouse.databases.access/roundhouse.databases.access.csproj
  6. +1 −0 product/roundhouse.databases.mysql/Properties/AssemblyInfo.cs
  7. +4 −19 product/roundhouse.databases.mysql/roundhouse.databases.mysql.csproj
  8. +1 −0 product/roundhouse.databases.oracle/Properties/AssemblyInfo.cs
  9. +4 −19 product/roundhouse.databases.oracle/roundhouse.databases.oracle.csproj
  10. +2 −1 product/roundhouse.databases.postgresql/Properties/AssemblyInfo.cs
  11. +5 −19 product/roundhouse.databases.postgresql/roundhouse.databases.postgresql.csproj
  12. +1 −0 product/roundhouse.databases.sqlite/Properties/AssemblyInfo.cs
  13. +4 −19 product/roundhouse.databases.sqlite/roundhouse.databases.sqlite.csproj
  14. +1 −0 product/roundhouse.databases.sqlserver/Properties/AssemblyInfo.cs
  15. +5 −21 product/roundhouse.databases.sqlserver/roundhouse.databases.sqlserver.csproj
  16. +1 −0 product/roundhouse.databases.sqlserver2000/Properties/AssemblyInfo.cs
  17. +4 −19 product/roundhouse.databases.sqlserver2000/roundhouse.databases.sqlserver2000.csproj
  18. +1 −0 product/roundhouse.databases.sqlserverce/Properties/AssemblyInfo.cs
  19. +3 −16 product/roundhouse.databases.sqlserverce/roundhouse.databases.sqlserverce.csproj
  20. +1 −0 product/roundhouse.tasks/Properties/AssemblyInfo.cs
  21. +4 −16 product/roundhouse.tasks/roundhouse.tasks.csproj
  22. +6 −5 product/roundhouse.tests.integration/Properties/AssemblyInfo.cs
  23. +4 −19 product/roundhouse.tests.integration/roundhouse.tests.integration.csproj
  24. +6 −5 product/roundhouse.tests/Properties/AssemblyInfo.cs
  25. +4 −11 product/roundhouse.tests/roundhouse.tests.csproj
  26. +1 −0 product/roundhouse/Properties/AssemblyInfo.cs
  27. +4 −18 product/roundhouse/roundhouse.csproj
  28. +1 −1 roundhouse.sln
View
@@ -5,7 +5,7 @@ $root = $PSScriptRoot;
$CODEDROP="$($root)\code_drop";
$LOGDIR="$($CODEDROP)\log";
$TESTOUTDIR="$($root)\build_output\RoundhousE.UnitTests\net461"
$TESTOUTDIR="$($root)\product\roundhouse.tests\bin"
pushd $root
@@ -30,7 +30,7 @@ nuget restore -NonInteractive -Verbosity quiet
#msbuild /nologo /v:q /fl /flp:"LogFile=$LOGDIR\msbuild.log;Verbosity=m" /p:Configuration=Build /p:Platform="Any CPU"
"`n * Building and packaging"
msbuild /t:Pack /p:DropFolder=$CODEDROP /p:Version="$($gitVersion.FullSemVer)" /p:NoPackageAnalysis=true /nologo /v:q /fl /flp:"LogFile=$LOGDIR\msbuild-nuget.log;Verbosity=m" /p:Configuration=Build /p:Platform="Any CPU"
msbuild /t:"Build;Pack" /p:DropFolder=$CODEDROP /p:Version="$($gitVersion.FullSemVer)" /p:NoPackageAnalysis=true /nologo /v:q /fl /flp:"LogFile=$LOGDIR\msbuild.log;Verbosity=n" /p:Configuration=Build /p:Platform="Any CPU"
# Find nunit3-console dynamically
"`n * Looking for nunit3-console.exe"
@@ -39,7 +39,7 @@ $nunit = $(dir -r $env:HOME\.nuget\packages\nunit* -i nunit3-console.exe | Selec
" - Found at $($nunit)"
"`n * Running unit tests`n"
$tests = $(dir "$($TESTOUTDIR)\*.tests.dll");
$tests = $(dir -r "$($TESTOUTDIR)" -i *.tests.dll);
& $nunit --noheader --noresult --output "$($LOGDIR)\nunit.log" --err="$($LOGDIR)\nunit.errlog" $tests
#"`n * Packaging"
@@ -1,7 +1,9 @@
using System.Reflection;
using System;
using System.Reflection;
using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a7a8d35d-cb38-4f12-a388-41c0fd21bf20")]
[assembly: System.CLSCompliant(true)]
//[assembly: AssemblyKeyFile("..\\..\\RoundhousE.snk")]
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CLSCompliant>true</CLSCompliant>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Exe</OutputType>
@@ -33,16 +34,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
<OutputPath>..\..\build_output\RoundhousE\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
@@ -66,25 +57,20 @@
<PackageReference Include="Iesi.Collections" Version="3.3.2.4000" />
<PackageReference Include="NHibernate" Version="3.3.2.4000" />
<PackageReference Include="NHibernate.JetDriver" Version="2.0.0.1001" />
<PackageReference Include="EnterpriseLibrary.TransientFaultHandling" Version="6.0.1304.0" >
<PackageReference Include="EnterpriseLibrary.TransientFaultHandling" Version="6.0.1304.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Data" Version="6.0.1304.1" />
<PackageReference Include="log4net" Version="2.0.8.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<PackageReference Include="StructureMap" Version="4.5.1.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionVersion.cs">
<Link>Properties\SolutionVersion.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\roundhouse.databases.access\roundhouse.databases.access.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.mysql\roundhouse.databases.mysql.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.oracle\roundhouse.databases.oracle.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.postgresql\roundhouse.databases.postgresql.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.sqlite\roundhouse.databases.sqlite.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.sqlite\roundhouse.databases.sqlite.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.sqlserver2000\roundhouse.databases.sqlserver2000.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.sqlserverce\roundhouse.databases.sqlserverce.csproj" ExcludeAssets="All" />
<ProjectReference Include="..\roundhouse.databases.sqlserver\roundhouse.databases.sqlserver.csproj" ExcludeAssets="All" />
@@ -102,7 +88,7 @@
<ILMergeTarget>$(ILMergeDir)$(AssemblyName).exe</ILMergeTarget>
</PropertyGroup>
<Target Name="ILMerge" BeforeTargets="Pack">
<Target Name="ILMerge" AfterTargets="Build">
<ItemGroup>
<ILMergeAssemblies Include="$(OutputPath)*.dll" />
</ItemGroup>
@@ -119,7 +105,6 @@
<Exec Command="$(ILMergeCommand)" />
</Target>
<!-- Nuspec properties (for generating NuGet package) -->
<PropertyGroup>
<NuspecFile>..\..\nuget\roundhouse\roundhouse.nuspec</NuspecFile>
@@ -3,4 +3,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("d1df5985-48bc-48b8-ba40-8c71920ac918")]
[assembly: System.CLSCompliant(true)]
//[assembly: AssemblyKeyFile("..\\..\\RoundhousE.snk")]
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CLSCompliant>true</CLSCompliant>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>roundhouse.databases.access</RootNamespace>
@@ -11,12 +12,12 @@
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -25,35 +26,19 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
<OutputPath>..\..\build_output\RoundhousE\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionVersion.cs">
<Link>Properties\SolutionVersion.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\roundhouse\roundhouse.csproj" />
</ItemGroup>
@@ -3,4 +3,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("1b301660-88e7-4a5b-b7b0-eceedcf8fbdc")]
[assembly: System.CLSCompliant(true)]
//[assembly: AssemblyKeyFile("..\\..\\RoundhousE.snk")]
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CLSCompliant>true</CLSCompliant>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>roundhouse.databases.mysql</RootNamespace>
@@ -11,30 +12,19 @@
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
<OutputPath>..\..\build_output\RoundhousE\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@@ -56,12 +46,7 @@
<PackageReference Include="NHibernate" version="3.3.2.4000" />
<PackageReference Include="Mysql.Data" version="6.9.9" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionVersion.cs">
<Link>Properties\SolutionVersion.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<ProjectReference Include="..\roundhouse\roundhouse.csproj" />
</ItemGroup>
</Project>
@@ -3,4 +3,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f9da0a8d-edee-4941-86ce-2a138b32286d")]
[assembly: System.CLSCompliant(true)]
//[assembly: AssemblyKeyFile("..\\..\\RoundhousE.snk")]
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CLSCompliant>true</CLSCompliant>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
@@ -12,12 +13,12 @@
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,36 +29,20 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
<OutputPath>..\..\build_output\RoundhousE\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionVersion.cs">
<Link>Properties\SolutionVersion.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentNHibernate" Version="1.3.0.733" />
<PackageReference Include="Iesi.Collections" Version="3.3.2.4000" />
@@ -2,4 +2,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("fe05ae73-d658-47c4-8117-ce0418e2e313")]
[assembly: Guid("fe05ae73-d658-47c4-8117-ce0418e2e313")]
[assembly: System.CLSCompliant(true)]
@@ -1,23 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CLSCompliant>true</CLSCompliant>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>roundhouse.databases.postgresql</RootNamespace>
<AssemblyName>roundhouse.databases.postgresql</AssemblyName>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<NoWarn>NU1701</NoWarn>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,22 +27,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">
<OutputPath>..\..\build_output\RoundhousE\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
@@ -55,11 +46,6 @@
<PackageReference Include="NHibernate" Version="3.3.2.4000" />
<PackageReference Include="Npgsql" Version="3.1.1.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\SolutionVersion.cs">
<Link>Properties\SolutionVersion.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\roundhouse\roundhouse.csproj" />
</ItemGroup>
@@ -3,4 +3,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("1b301660-88e7-4a5b-b7b0-eceedcf8fbdc")]
[assembly: System.CLSCompliant(true)]
//[assembly: AssemblyKeyFile("..\\..\\RoundhousE.snk")]
Oops, something went wrong.

0 comments on commit 06c9736

Please sign in to comment.