AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Framework projects over to SDK-style using https://github.com/onovotny/MSBuildSdkExtras

This commit is contained in:
Antony Male 2019-09-22 13:26:34 +01:00
parent f7ec7a255a
commit 5184df214d
4 changed files with 38 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Stylet.Framework/Stylet.Framework.csproj
View File

@ -1,79 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <Project Sdk="MSBuild.Sdk.Extras">
<Project ToolsVersion="12.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')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <TargetFramework>net45</TargetFramework>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>Stylet</RootNamespace> <RootNamespace>Stylet</RootNamespace>
<AssemblyName>Stylet</AssemblyName> <AssemblyName>Stylet</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>full</DebugType> <CodeAnalysisRuleSet />
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>
</CodeAnalysisRuleSet>
<DocumentationFile>bin\Debug\Stylet.xml</DocumentationFile>
<LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>true</Optimize> <CodeAnalysisRuleSet />
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Stylet.xml</DocumentationFile>
<CodeAnalysisRuleSet>
</CodeAnalysisRuleSet>
<LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="PresentationCore" /> <Compile Include="..\Stylet\**\*.cs" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Stylet\**\*.cs" Ignore="..\Stylet\obj\**" Link="%(RecursiveDir)%(FileName)%(Extension)" />
<None Include="..\Stylet\Settings.StyleCop" Link="Settings.StyleCop" /> <None Include="..\Stylet\Settings.StyleCop" Link="Settings.StyleCop" />
<None Include="..\Stylet\Stylet.ruleset" Link="Stylet.ruleset" /> <None Include="..\Stylet\Stylet.ruleset" Link="Stylet.ruleset" />
<Page Include="..\Stylet\MessageBoxView.xaml" Link="MessageBoxView.xaml"> <Page Include="..\Stylet\MessageBoxView.xaml" Link="MessageBoxView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="..\Stylet\Xaml\StyletResourceDictionary.xaml" Link="Xaml\StyletResourceDictionary.xaml"> <Page Include="..\Stylet\Xaml\StyletResourceDictionary.xaml" Link="Xaml\StyletResourceDictionary.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
</ItemGroup> </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> </Project>

9
StyletIntegrationTests.Core/StyletIntegrationTests.Core.csproj
View File

@ -8,14 +8,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>StyletIntegrationTests</RootNamespace> <RootNamespace>StyletIntegrationTests</RootNamespace>
<AssemblyName>StyletIntegrationTests</AssemblyName> <AssemblyName>StyletIntegrationTests</AssemblyName>
</PropertyGroup> <CodeAnalysisRuleSet/>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<CodeAnalysisRuleSet />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<CodeAnalysisRuleSet />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

75
StyletIntegrationTests.Framework/StyletIntegrationTests.Framework.csproj
View File

@ -1,62 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <Project Sdk="MSBuild.Sdk.Extras">
<Project ToolsVersion="12.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')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C6021258-7CAE-4BC2-A08E-8433019405B7}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <TargetFramework>net45</TargetFramework>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>StyletIntegrationTests</RootNamespace> <RootNamespace>StyletIntegrationTests</RootNamespace>
<AssemblyName>StyletIntegrationTests</AssemblyName> <AssemblyName>StyletIntegrationTests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <CodeAnalysisRuleSet/>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <ProjectReference Include="..\Stylet.Framework\Stylet.Framework.csproj" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="..\StyletIntegrationTests\App.xaml"> <ApplicationDefinition Include="..\StyletIntegrationTests\App.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition> </ApplicationDefinition>
<Compile Include="..\StyletIntegrationTests\**\*.cs" Link="%(RecursiveDir)%(FileName)%(Extension)" /> <Compile Include="..\StyletIntegrationTests\**\*.cs" />
<Page Include="..\StyletIntegrationTests\ShellView.xaml" Link="ShellView.xaml"> <Page Include="..\StyletIntegrationTests\ShellView.xaml" Link="ShellView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
@ -71,18 +35,5 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Stylet.Framework\Stylet.Framework.csproj">
<Project>{2435bd00-ac12-48b0-ad36-9bab2fdec3f5}</Project>
<Name>Stylet.Framework</Name>
</ProjectReference>
</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> </Project>

8
global.json Normal file
View File

@ -0,0 +1,8 @@
{
"sdk": {
"version": "3.0.100-preview"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.24"
}
}