Skip to content

Commit

Permalink
Migrated Moryx.Products.UI.* and Moryx.Resources.UI.* to SDK project …
Browse files Browse the repository at this point in the history 
…style
  • Loading branch information
@dbeuchler
dbeuchler committed Oct 12, 2020
1 parent 6809aa1 commit e94e2bb
Show file tree
Hide file tree
Showing 84 changed files with 2,777 additions and 5,822 deletions.
3 changes: 2 additions & 1 deletion AbstractionLayer.UI.sln.DotSettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=FDC70670E122DE43A211C8FE4BD58287/RelativePath/@EntryValue">..\.build\Global.DotSettings</s:String>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=FDC70670E122DE43A211C8FE4BD58287/@KeyIndexDefined">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileFDC70670E122DE43A211C8FE4BD58287/@KeyIndexDefined">True</s:Boolean>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileFDC70670E122DE43A211C8FE4BD58287/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileFDC70670E122DE43A211C8FE4BD58287/RelativePriority/@EntryValue">1</s:Double>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Moryx/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion Build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if ($Build) {
}

if ($SmokeTests) {
$runtimePath = "$RootPath\src\StartProject\bin\$env:MORYX_BUILD_CONFIG\StartProject.exe";
$runtimePath = "$RootPath\src\StartProject\bin\$env:MORYX_BUILD_CONFIG\net45\StartProject.exe";
Invoke-SmokeTest $runtimePath 4 6000
}

Expand Down
176 changes: 22 additions & 154 deletions src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,173 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<Import Project="..\..\.build\Common.props"></Import>

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B9920541-7E0E-4CDE-B195-B18589A2BBB1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Moryx.AbstractionLayer.UI</RootNamespace>
<AssemblyName>Moryx.AbstractionLayer.UI</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</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>
<DocumentationFile>bin\Debug\Moryx.AbstractionLayer.UI.XML</DocumentationFile>
</PropertyGroup>
<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>
<DocumentationFile>bin\Release\Moryx.AbstractionLayer.UI.XML</DocumentationFile>
<TargetFramework>net45</TargetFramework>
<UseWPF>true</UseWPF>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Description>Moryx.AbstractionLayer.UI</Description>
<CreatePackage>true</CreatePackage>
</PropertyGroup>

<ItemGroup>
<Reference Include="Caliburn.Micro, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Caliburn.Micro.Core.3.2.0\lib\net45\Caliburn.Micro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Caliburn.Micro.Platform, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\..\packages\Castle.Windsor.5.0.1\lib\net45\Castle.Windsor.dll</HintPath>
</Reference>
<Reference Include="Controls4Industry, Version=3.0.0.32, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Controls4Industry.3.0.0-dev.32\lib\net461\Controls4Industry.dll</HintPath>
</Reference>
<Reference Include="Moryx, Version=3.0.0.105, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moryx.3.0.0-dev.105\lib\netstandard2.0\Moryx.dll</HintPath>
</Reference>
<Reference Include="Moryx.ClientFramework, Version=3.0.0.32, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moryx.ClientFramework.3.0.0-dev.32\lib\net461\Moryx.ClientFramework.dll</HintPath>
</Reference>
<Reference Include="Moryx.Tools.Wcf, Version=3.0.0.105, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moryx.Tools.Wcf.3.0.0-dev.105\lib\net461\Moryx.Tools.Wcf.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Aspects\AspectConductorView.xaml.cs">
<DependentUpon>AspectConductorView.xaml</DependentUpon>
</Compile>
<Compile Include="Aspects\AspectConductorViewModel.cs" />
<Compile Include="Aspects\AspectConfiguratorView.xaml.cs">
<DependentUpon>AspectConfiguratorView.xaml</DependentUpon>
</Compile>
<Compile Include="Aspects\AspectConfiguratorViewModel.cs" />
<Compile Include="Aspects\IAspectConfigurator.cs" />
<Compile Include="Aspects\IAspectConfiguratorFactory.cs" />
<Compile Include="Aspects\AspectConfiguration.cs" />
<Compile Include="Aspects\IAspect.cs" />
<Compile Include="Aspects\IAspectFactory.cs" />
<Compile Include="Aspects\TypedAspectConfiguration.cs" />
<Compile Include="Controls\EditModeButtonControl.xaml.cs">
<DependentUpon>EditModeButtonControl.xaml</DependentUpon>
</Compile>
<Compile Include="Converters\SortedCollectionViewSourceConverter.cs" />
<Compile Include="Extensions\CollectionExtensions.cs" />
<Compile Include="Extensions\IIdentifiableObject.cs" />
<Compile Include="Extensions\IMergeStrategy.cs" />
<Compile Include="Extensions\ITreeItemModel.cs" />
<Compile Include="MasterDetails\DetailsComponentSelector.cs" />
<Compile Include="MasterDetails\DetailsConstants.cs" />
<Compile Include="MasterDetails\DetailsRegistrationAttribute.cs" />
<Compile Include="MasterDetails\EmptyDetailsViewModelBase.cs" />
<Compile Include="MasterDetails\IDetailsFactory.cs" />
<Compile Include="EditModeBase\EditModeViewModelBase.cs" />
<Compile Include="EditModeBase\IEditModeViewModel.cs" />
<Compile Include="MasterDetails\IDetailsViewModel.cs" />
<Compile Include="MasterDetails\MasterDetailsWorkspace.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Strings.Designer.cs">
<AutoGen>True</AutoGen>
<PackageReference Include="Moryx.ClientFramework" Version="3.0.0-dev.41" />
<PackageReference Include="Caliburn.Micro" Version="3.2.0" />
<PackageReference Include="Castle.Windsor" Version="5.0.1" />
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Strings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
<Compile Include="TreeItemViewModel.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Moryx.AbstractionLayer.UI.csproj.DotSettings" />
<None Include="Moryx.AbstractionLayer.UI.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Page Include="Aspects\AspectConductorView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Aspects\AspectConfiguratorView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\EditModeButtonControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ToolbarButtonStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Properties\Strings.de.resx" />
<EmbeddedResource Include="Properties\Strings.pl.resx" />
<EmbeddedResource Include="Properties\Strings.resx">
<EmbeddedResource Update="Properties\Strings.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
28 changes: 0 additions & 28 deletions src/Moryx.AbstractionLayer.UI/Properties/AssemblyInfo.cs
View file

This file was deleted.

Loading

0 comments on commit e94e2bb

Please sign in to comment.