Skip to content

Switch to SDK Format and add NET5 as target. Also add Test app for NET5. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Switch to SDK Format and add NET5 as target. Also add Test app for NET5. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 15 additions & 62 deletions src/AutoGrid.Tests/AutoGrid.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<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')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D3DF2A55-FF73-4BC5-B1F4-2B71B3BC523A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AutoGrid.Tests</RootNamespace>
<AssemblyName>SpicyTaco.AutoGrid.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<TargetFramework>net48</TargetFramework>
<AssemblyTitle>SpicyTaco.AutoGrid.Tests</AssemblyTitle>
<Product>SpicyTaco.AutoGrid.Tests</Product>
<OutputPath>..\bin\$(Configuration)\</OutputPath>
<Configurations>Debug;Release</Configurations>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
</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>
</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>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions">
<HintPath>..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions.Core">
<HintPath>..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<PackageReference Include="FluentAssertions" Version="3.1.229" />
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AutoGrid\AutoGrid.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand All @@ -51,34 +33,5 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
</Reference>
<Reference Include="xunit.extensions, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="describe_auto_grid.cs" />
<Compile Include="describe_stack_panel.cs" />
<Compile Include="FluentAssertionExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AutoGrid\AutoGrid.csproj">
<Project>{60440edd-cc03-479d-aa9d-7c6e53a57630}</Project>
<Name>AutoGrid</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</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>
36 changes: 0 additions & 36 deletions src/AutoGrid.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

17 changes: 13 additions & 4 deletions src/AutoGrid.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
# Visual Studio Version 16
VisualStudioVersion = 16.0.30709.132
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGrid", "AutoGrid\AutoGrid.csproj", "{60440EDD-CC03-479D-AA9D-7C6E53A57630}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGrid", "AutoGrid\AutoGrid.csproj", "{60440EDD-CC03-479D-AA9D-7C6E53A57630}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGrid.Tests", "AutoGrid.Tests\AutoGrid.Tests.csproj", "{D3DF2A55-FF73-4BC5-B1F4-2B71B3BC523A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGrid.Tests", "AutoGrid.Tests\AutoGrid.Tests.csproj", "{D3DF2A55-FF73-4BC5-B1F4-2B71B3BC523A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGridSampleNET5", "AutoGridSampleNET5\AutoGridSampleNET5.csproj", "{994B4629-C448-4F48-A901-DDB5A7DD96EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoGridSample", "AutoGridSample\AutoGridSample.csproj", "{9E27C0EB-65CA-4C87-AD31-88AB40458BEE}"
EndProject
Expand All @@ -23,6 +25,10 @@ Global
{D3DF2A55-FF73-4BC5-B1F4-2B71B3BC523A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3DF2A55-FF73-4BC5-B1F4-2B71B3BC523A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3DF2A55-FF73-4BC5-B1F4-2B71B3BC523A}.Release|Any CPU.Build.0 = Release|Any CPU
{994B4629-C448-4F48-A901-DDB5A7DD96EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{994B4629-C448-4F48-A901-DDB5A7DD96EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{994B4629-C448-4F48-A901-DDB5A7DD96EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{994B4629-C448-4F48-A901-DDB5A7DD96EF}.Release|Any CPU.Build.0 = Release|Any CPU
{9E27C0EB-65CA-4C87-AD31-88AB40458BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E27C0EB-65CA-4C87-AD31-88AB40458BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E27C0EB-65CA-4C87-AD31-88AB40458BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -31,4 +37,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0FDDC486-D357-41D1-A07D-4BF1A9ACD577}
EndGlobalSection
EndGlobal
52 changes: 9 additions & 43 deletions src/AutoGrid/AutoGrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<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')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{60440EDD-CC03-479D-AA9D-7C6E53A57630}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AutoGrid</RootNamespace>
<AssemblyName>SpicyTaco.AutoGrid</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<TargetFrameworks>net4;net5.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyTitle>SpicyTaco.AutoGrid</AssemblyTitle>
<Product>SpicyTaco.AutoGrid</Product>
<OutputPath>..\bin\$(Configuration)\</OutputPath>
<Configurations>Debug;Release</Configurations>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
</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>
</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>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="AutoGrid.cs" />
<Compile Include="DependencyHelper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="StackPanel.cs" />
</ItemGroup>
<ItemGroup>
<None Include="AutoGrid.nuspec" />
</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>
40 changes: 0 additions & 40 deletions src/AutoGrid/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/AutoGridSample/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Window x:Class="AutoGridSample.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:st="http://schemas.spicytaco.io/"
xmlns:st="clr-namespace:AutoGrid;assembly=AutoGrid"
SizeToContent="Height"
Width="600"
Title="MainWindow">
Expand Down
6 changes: 6 additions & 0 deletions src/AutoGridSampleNet5/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>
8 changes: 8 additions & 0 deletions src/AutoGridSampleNet5/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Application x:Class="AutoGridSampleNET5.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml">
<Application.Resources>

</Application.Resources>
</Application>
11 changes: 11 additions & 0 deletions src/AutoGridSampleNet5/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Windows;

namespace AutoGridSampleNET5
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}
33 changes: 33 additions & 0 deletions src/AutoGridSampleNet5/AutoGridSampleNET5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<TargetFrameworks>net5.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyTitle>AutoGridSample</AssemblyTitle>
<Product>AutoGridSample</Product>
<OutputPath>..\bin\$(Configuration)\</OutputPath>
<Configurations>Debug;Release</Configurations>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<OutputType>WinExe</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\AutoGrid\AutoGrid.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
</Project>
Loading