Skip to content

Commit

Permalink
Support .NET Standard
Browse files Browse the repository at this point in the history
  • Loading branch information
mettekou authored and mikeobrien committed Oct 30, 2019
1 parent a7b7b01 commit 8c21825
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 230 deletions.
36 changes: 0 additions & 36 deletions src/TDMSReader/Properties/AssemblyInfo.cs

This file was deleted.

65 changes: 8 additions & 57 deletions src/TDMSReader/TDMSReader.csproj
Original file line number Diff line number Diff line change
@@ -1,60 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{11347AB4-7FD3-4398-8AF5-37AE57D89FEC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NationalInstruments.Tdms</RootNamespace>
<AssemblyName>TDMSReader</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
<Description>National Instruments TDMS File Reader for .NET and Mono.</Description>
<Copyright>Copyright © 2011 Ultraviolet Catastrophe</Copyright>
<Product>TDMS Reader</Product>
<Company>Ultraviolet Catastrophe</Company>
<Authors />
<PackageId />
</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="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Channel.cs" />
<Compile Include="DataType.cs" />
<Compile Include="File.cs" />
<Compile Include="Group.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Writer.cs" />
<Compile Include="Reader.cs" />
<Compile Include="BinaryReaderExtensions.cs" />
</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/Tests/Properties/AssemblyInfo.cs

This file was deleted.

114 changes: 19 additions & 95 deletions src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,110 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D3DF0E6C-F7C0-4E04-84AC-73FBCF1C89DC}</ProjectGuid>
<TargetFrameworks>net40</TargetFrameworks>
<ApplicationIcon />
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Tests</RootNamespace>
<AssemblyName>Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</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>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="NSubstitute">
<HintPath>..\packages\NSubstitute.1.1.0.0\lib\35\NSubstitute.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.mocks">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
</Reference>
<Reference Include="pnunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
</Reference>
<Reference Include="Should">
<HintPath>..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<PackageReference Include="NSubstitute" Version="1.1.0" />
<PackageReference Include="NUnit" Version="2.5.10.11092" />
<PackageReference Include="NUnitTestAdapter" Version="2.2.0" />
<PackageReference Include="Should" Version="1.1.12" />
</ItemGroup>
<ItemGroup>
<Compile Include="Constants.cs" />
<Compile Include="ChannelTests.cs" />
<Compile Include="AdditionalPropertiesFileTests.cs" />
<Compile Include="FileStreamingTests.cs" />
<Compile Include="GroupTests.cs" />
<Compile Include="FileTests.cs" />
<Compile Include="IncrementalMetaDataTests.cs" />
<Compile Include="PropertyRewrittenTests.cs" />
<Compile Include="WriteTests.cs" />
<Compile Include="SampleUsage.cs" />
<Compile Include="ReaderRawDataTests.cs" />
<Compile Include="BinaryReaderExtensionsTests.cs" />
<Compile Include="ReaderTestsBase.cs" />
<Compile Include="ReaderMetadataTests.cs" />
<Compile Include="ReaderSegmentTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<ProjectReference Include="..\TDMSReader\TDMSReader.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="IncrementalMetaInformation.tdms">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<None Update="AdditionalProperties.tdms">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="IncrementalMetaInformationInterleavedData.tdms">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<None Update="IncrementalMetaInformation.tdms">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="PropertyRewritten.tdms">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<None Update="IncrementalMetaInformationInterleavedData.tdms">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Sample.tdms">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<None Update="PropertyRewritten.tdms">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="AdditionalProperties.tdms">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<None Update="Sample.tdms">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TDMSReader\TDMSReader.csproj">
<Project>{11347AB4-7FD3-4398-8AF5-37AE57D89FEC}</Project>
<Name>TDMSReader</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</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>
6 changes: 0 additions & 6 deletions src/Tests/packages.config

This file was deleted.

0 comments on commit 8c21825

Please sign in to comment.