Skip to content

Commit

Permalink
Next steps to a cleaner structure
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanKert committed Mar 9, 2019
1 parent f227aa9 commit 645cf64
Show file tree
Hide file tree
Showing 84 changed files with 2,316 additions and 2,479 deletions.
9 changes: 8 additions & 1 deletion BuildVision.sln
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildVision.UI", "src\Build
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1DE272AA-D641-45F2-AEB9-934B3BAA6FBD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildVision.IntegrationTests", "test\BuildVision.IntegrationTests\BuildVision.IntegrationTests.csproj", "{FBB4F3ED-B1B8-4401-8667-5180194BAA54}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildVision.IntegrationTests", "test\BuildVision.IntegrationTests\BuildVision.IntegrationTests.csproj", "{FBB4F3ED-B1B8-4401-8667-5180194BAA54}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildVision.UnitTests", "test\BuildVision.UnitTests\BuildVision.UnitTests.csproj", "{2A7DE186-A1FA-4BA8-B393-3CA9ECBF444F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildVision.Exports", "src\BuildVision.Exports\BuildVision.Exports.csproj", "{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -61,6 +63,10 @@ Global
{2A7DE186-A1FA-4BA8-B393-3CA9ECBF444F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A7DE186-A1FA-4BA8-B393-3CA9ECBF444F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A7DE186-A1FA-4BA8-B393-3CA9ECBF444F}.Release|Any CPU.Build.0 = Release|Any CPU
{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -72,6 +78,7 @@ Global
{84E8BA65-9A4B-4C50-A115-6EF3208E4058} = {AE904AFF-1B2B-4D8F-9826-57BC13DC4AC5}
{FBB4F3ED-B1B8-4401-8667-5180194BAA54} = {1DE272AA-D641-45F2-AEB9-934B3BAA6FBD}
{2A7DE186-A1FA-4BA8-B393-3CA9ECBF444F} = {1DE272AA-D641-45F2-AEB9-934B3BAA6FBD}
{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E} = {AE904AFF-1B2B-4D8F-9826-57BC13DC4AC5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1485240E-4A28-4FA4-8D69-3D8151C3E1F6}
Expand Down
3 changes: 1 addition & 2 deletions src/BuildVision.Contracts/BuildVision.Contracts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BaseGridColumnSettings.cs" />
<Compile Include="Enums\BuildResultState.cs" />
<Compile Include="Enums\BuildActions.cs" />
<Compile Include="BuildedProject.cs" />
<Compile Include="BuildedSolution.cs" />
<Compile Include="BuildErrorRaisedEventArgs.cs" />
<Compile Include="BuildOutputFileTypes.cs" />
<Compile Include="Enums\BuildScopes.cs" />
Expand Down
17 changes: 0 additions & 17 deletions src/BuildVision.Contracts/BuildedSolution.cs

This file was deleted.

22 changes: 22 additions & 0 deletions src/BuildVision.Contracts/Enums/BuildResultState.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace BuildVision.Contracts
{
public enum BuildResultState
{
Unknown,

RebuildSucceeded,
RebuildSucceededWithErrors,
RebuildFailed,
RebuildCancelled,

BuildSucceeded,
BuildSucceededWithErrors,
BuildFailed,
BuildCancelled,

CleanSucceeded,
CleanSucceededWithErrors,
CleanFailed,
CleanCancelled
}
}
5 changes: 3 additions & 2 deletions src/BuildVision.Contracts/Enums/BuildState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum BuildState
{
NotStarted = 0,
InProgress = 1,
Done = 2
Done = 2,
Cancelled = 3
}
}
}
2 changes: 1 addition & 1 deletion src/BuildVision.Contracts/PropertyNotFoundException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ public override string Message
get { return string.Format("Property '{0}' not found in '{1}' type.", _propertyName, _type); }
}
}
}
}
9 changes: 9 additions & 0 deletions src/BuildVision.Exports/BuildVision.Exports.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

</Project>
Binary file added src/BuildVision.Exports/Key.snk
Binary file not shown.
14 changes: 14 additions & 0 deletions src/BuildVision.Exports/Sevices/IBuildService.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace BuildVision.Exports.Services
{
public interface IBuildService
{
void ShowGridColumnsSettingsPage();
void ShowGeneralSettingsPage();
void BuildSolution();
void CleanSolution();
void RebuildSolution();
void CancelBuildSolution();
void ProjectCopyBuildOutputFilesToClipBoard();
void RaiseCommandForSelectedProject();
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
namespace BuildVision.Core
namespace BuildVision.Exports.Services
{
public interface IStatusBarNotificationService
{
void ShowText(string str);
void ShowTextWithFreeze(string str);
}
}
}
14 changes: 14 additions & 0 deletions src/BuildVision.Exports/ViewModels/IBuildVisionPaneViewModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BuildVision.Exports.ViewModels;

namespace BuildVision.Exports.ViewModels
{
public interface IBuildVisionPaneViewModel : IViewModel
{
}
}
9 changes: 9 additions & 0 deletions src/BuildVision.Exports/ViewModels/IViewModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using System;
using System.ComponentModel;

namespace BuildVision.Exports.ViewModels
{
public interface IViewModel : INotifyPropertyChanged
{
}
}
69 changes: 34 additions & 35 deletions src/BuildVision.UI/BuildVision.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Helpers\ResetTaskBarItemInfoCondition.cs" />
<Compile Include="Helpers\SortDescription.cs" />
<Compile Include="Helpers\SortOrder.cs" />
<Compile Include="Helpers\WindowState.cs" />
<Compile Include="Helpers\WindowStateAction.cs" />
<Compile Include="IPackageSettingsProvider.cs" />
<Compile Include="Models\BaseGridColumnSettings.cs" />
<Compile Include="Models\BuildMessagesSettings.cs" />
<Compile Include="Models\BuildProgressSettings.cs" />
<Compile Include="Common\Logging\BindingErrorListener.cs" />
<Compile Include="Common\Logging\TraceManager.cs" />
<Compile Include="Components\ControlHeader.xaml.cs">
Expand All @@ -83,10 +92,12 @@
</Compile>
<Compile Include="Contracts\BuildedProjectsCollection.cs" />
<Compile Include="Contracts\BuildProjectContextEntry.cs" />
<Compile Include="Contracts\IBuildDistributor.cs" />
<Compile Include="Models\ControlSettings.cs" />
<Compile Include="Models\GeneralSettings.cs" />
<Compile Include="Models\GridColumnSettings.cs" />
<Compile Include="Models\GridColumnSettingsCollection.cs" />
<Compile Include="Models\GridSettings.cs" />
<Compile Include="Helpers\BindingProxy.cs" />
<Compile Include="Helpers\BuildImages.cs" />
<Compile Include="Contracts\BuildInfo.cs" />
<Compile Include="Helpers\BuildMessages.cs" />
<Compile Include="Contracts\BuildProjectEventArgs.cs" />
<Compile Include="Components\ControlView.xaml.cs">
Expand All @@ -107,44 +118,18 @@
<Compile Include="Helpers\DisplayStringAttribute.cs" />
<Compile Include="Helpers\EnumExtensions.cs" />
<Compile Include="Helpers\StyleConverting.cs" />
<Compile Include="IBuildVisionPaneViewModel.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Models\ControlModel.cs" />
<Compile Include="Models\Indicators\Core\ResetIndicatorMode.cs" />
<Compile Include="Models\Indicators\Core\ValueIndicator.cs" />
<Compile Include="Models\Indicators\Core\ValueIndicatorsFactory.cs" />
<Compile Include="Models\Indicators\ErrorProjectsIndicator.cs" />
<Compile Include="Models\Indicators\ErrorsIndicator.cs" />
<Compile Include="Models\Indicators\MessagesIndicator.cs" />
<Compile Include="Models\Indicators\SeparatorIndicator.cs" />
<Compile Include="Models\Indicators\SuccessProjectsIndicator.cs" />
<Compile Include="Models\Indicators\UpToDateProjectsIndicator.cs" />
<Compile Include="Models\Indicators\WarningProjectsIndicator.cs" />
<Compile Include="Models\Indicators\WarningsIndicator.cs" />
<Compile Include="Models\ProjectItem.cs" />
<Compile Include="Extensions\ProjectStateExtensions.cs" />
<Compile Include="Models\BuildExtraMessageFormat.cs" />
<Compile Include="Models\BuildMajorMessageFormat.cs" />
<Compile Include="Settings\Models\BuildMessagesSettings.cs" />
<Compile Include="Settings\Models\BuildProgress\BuildProgressSettings.cs" />
<Compile Include="Models\NavigateToBuildFailureReasonCondition.cs" />
<Compile Include="Models\ResetTaskBarItemInfoCondition.cs" />
<Compile Include="Models\GridColumnAttribute.cs" />
<Compile Include="Settings\Models\Columns\GridColumnSettings.cs" />
<Compile Include="Settings\Models\Columns\GridColumnSettingsCollection.cs" />
<Compile Include="Settings\Models\ControlSettings.cs" />
<Compile Include="Settings\Models\GeneralSettings.cs" />
<Compile Include="Settings\Models\GridSettings.cs" />
<Compile Include="Settings\Models\ProjectItemSettings.cs" />
<Compile Include="Helpers\ProjectItemColumnSorter.cs" />
<Compile Include="Settings\Models\Sorting\SortDescription.cs" />
<Compile Include="Models\SortOrder.cs" />
<Compile Include="Models\WindowState.cs" />
<Compile Include="Settings\Models\ToolWindow\WindowStateAction.cs" />
<Compile Include="Settings\Models\WindowSettings.cs" />
<Compile Include="Models\SolutionItem.cs" />
<Compile Include="Models\ProjectItemSettings.cs" />
<Compile Include="Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
Expand All @@ -168,8 +153,11 @@
<Compile Include="Settings\WindowSettingsControl.xaml.cs">
<DependentUpon>WindowSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModels\SolutionModel.cs" />
<Compile Include="ViewModels\BuildProgressViewModel.cs" />
<Compile Include="ViewModels\BuildVisionPaneViewModel.cs" />
<Compile Include="ViewModels\VisualStudioSolution.cs" />
<Compile Include="Models\WindowSettings.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="Converters\AlternatingRowBackgroundConverter.cs" />
Expand All @@ -180,11 +168,8 @@
<Compile Include="Converters\GridColumnHeadersVisibilityToBooleanConverter.cs" />
<Compile Include="Converters\GridColumnSettingsToColumnExampleValueConverter.cs" />
<Compile Include="Converters\GridColumnSettingsToInitialColumnHeaderConverter.cs" />
<Compile Include="Converters\IndicatorVectorIconConverter.cs" />
<Compile Include="Converters\InverseBooleanConverter.cs" />
<Compile Include="Converters\InvertSolidColorBrushConverter.cs" />
<Compile Include="Converters\IsErrorToBorderThicknessConverter.cs" />
<Compile Include="Converters\IsSeparatorIndicatorConverter.cs" />
<Compile Include="Converters\LogEntryTypeToImageSourceConverter.cs" />
<Compile Include="Converters\MultiBindingStringFormatConverter.cs" />
<Compile Include="Converters\NumberToIsPositiveConverter.cs" />
Expand Down Expand Up @@ -251,12 +236,22 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\BuildResult.Resources.Test.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Resources\BuildResult.Resources.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Resources\BuildAction.Resources.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Resources\BuildAction.Resources.Test.xaml">
<Page Include="Resources\BuildState.Resources.Test.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down Expand Up @@ -285,7 +280,7 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Page>
<Page Include="Resources\BuildState.Resources.Test.xaml">
<Page Include="Resources\BuildAction.Resources.Test.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down Expand Up @@ -362,6 +357,10 @@
<Project>{13d64a57-5db3-4cc7-ac2b-9034e767d754}</Project>
<Name>BuildVision.Contracts</Name>
</ProjectReference>
<ProjectReference Include="..\BuildVision.Exports\BuildVision.Exports.csproj">
<Project>{F16E6593-DDF9-4E9E-A2F8-56A3C43A643E}</Project>
<Name>BuildVision.Exports</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0">
Expand Down
Loading

0 comments on commit 645cf64

Please sign in to comment.