Skip to content

Changed target framework from .net framework to .net standard 2.0 #7

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
Frederik91 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed target framework from .net framework to .net standard 2.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
660fdd6
Changed target framework from .net framework to .net standard 2.0
frte-cowi May 27, 2021
db0208b
Removed old code
frte-cowi May 27, 2021
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
27 changes: 15 additions & 12 deletions src/LightInject.xUnit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31205.134
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2", "LightInject.xUnit2\LightInject.xUnit2.csproj", "{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2", "LightInject.xUnit2\LightInject.xUnit2.csproj", "{EEA1E6AA-5139-4E48-8752-D61640676D1D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2.Tests", "LightInject.xUnit2.Tests\LightInject.xUnit2.Tests.csproj", "{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2.Tests", "LightInject.xUnit2.Tests\LightInject.xUnit2.Tests.csproj", "{0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Release|Any CPU.Build.0 = Release|Any CPU
{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Release|Any CPU.Build.0 = Release|Any CPU
{EEA1E6AA-5139-4E48-8752-D61640676D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEA1E6AA-5139-4E48-8752-D61640676D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEA1E6AA-5139-4E48-8752-D61640676D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEA1E6AA-5139-4E48-8752-D61640676D1D}.Release|Any CPU.Build.0 = Release|Any CPU
{0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6E919CE6-7482-4E6C-AF09-305BFB6A221E}
EndGlobalSection
EndGlobal
118 changes: 26 additions & 92 deletions src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
<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>{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LightInject.xUnit2.Tests</RootNamespace>
<AssemblyName>LightInject.xUnit2.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFramework>netcoreapp3.1</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET46</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;NET46</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="LightInject, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.5.0.0\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</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.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SampleServices\Bar.cs" />
<Compile Include="SampleServices\Foo.cs" />
<Compile Include="SampleServices\SampleService.cs" />
<Compile Include="xUnit2Tests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\LightInject.xUnit2\LightInject.xUnit2.csproj">
<Project>{245abd3a-3fe2-480f-b4ff-6fc72ac11acc}</Project>
<Name>LightInject.xUnit2</Name>
</ProjectReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="CoverageToXml">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="LightInject">
<Version>6.4.0</Version>
</PackageReference>
<PackageReference Include="ReportGenerator">
<Version>4.8.9</Version>
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
<ProjectReference Include="..\LightInject.xUnit2\LightInject.xUnit2.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<!-- 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>
2 changes: 0 additions & 2 deletions src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj.DotSettings
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/LightInject.xUnit2.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/LightInject.xUnit2.Tests/packages.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/LightInject.xUnit2/LightInject.xUnit2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public override IEnumerable<object[]> GetData(MethodInfo methodUnderTest)
/// <summary>
/// This method is only executed when the test app domains are unloaded.
/// </summary>
[ExcludeFromCodeCoverage]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
private static void EndAllScopes()
{
foreach (var container in Containers.Values)
Expand Down
99 changes: 17 additions & 82 deletions src/LightInject.xUnit2/LightInject.xUnit2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,21 @@
<?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">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LightInject.xUnit2</RootNamespace>
<AssemblyName>LightInject.xUnit2</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET46</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\LightInject.xUnit2.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NET46</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\LightInject.xUnit2.XML</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="LightInject, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.5.0.0\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</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.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="LightInject.xUnit2.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="NuGet\LightInject.Xunit2.nuspec" />
<None Include="NuGet\LightInject.Xunit2.Source.nuspec" />
<None Include="packages.config" />
</ItemGroup>

<ItemGroup>
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
<PackageReference Include="LightInject">
<Version>6.4.0</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.118</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.core">
<Version>2.4.1</Version>
</PackageReference>
</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>
2 changes: 0 additions & 2 deletions src/LightInject.xUnit2/LightInject.xUnit2.csproj.DotSettings
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/LightInject.xUnit2/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

Loading