Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.*" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
<PackageReference Include="PolySharp" Version="1.*" PrivateAssets="All" />

<Reference Include="System.Net.Http" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
</ItemGroup>

Expand Down
45 changes: 45 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<!-- need to enable floating version support explicitly for now -->
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="9.*" />
<PackageVersion Include="FluentAssertions" Version="6.*" />
<PackageVersion Include="FSharp.Core" Version="8.*" />

<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.*" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />

<!-- https://github.com/dotnet/roslyn-sdk/blob/main/src/Microsoft.CodeAnalysis.Testing/README.md -->
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.*" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.*" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.*" />

<PackageVersion Include="Ben.Demystifier" Version="0.*" />
<PackageVersion Include="coverlet.collector" Version="6.*" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.*" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(_TargetFrameworkVersionWithoutV)" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />

<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageVersion Include="xunit" Version="2.*" />
<PackageVersion Include="xunit.core" Version="[2.4.2, 3.0.0)" />
<PackageVersion Include="xunit.extensibility.execution" Version="[2.4.2, 3.0.0)" />
<PackageVersion Include="xRetry" Version="[1.9.0, 2.0.0)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.*" />
<PackageVersion Include="Xunit.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.*" />
<PackageVersion Include="System.ValueTuple" Version="4.*" />
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.*"/>
</ItemGroup>
<ItemGroup>
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.*" />
<GlobalPackageReference Include="PolySharp" Version="1.*" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />

<Compile Update="AnalyzerResources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="AnalyzerResources.resx" />
<Compile Update="CodeFixResources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="CodeFixResources.resx" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class Startup
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(_TargetFrameworkVersionWithoutV)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />

<ProjectReference Include="..\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void ConfigureServices(IServiceCollection services)
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ben.Demystifier" Version="0.*" />
<PackageReference Include="Ben.Demystifier" />

<ProjectReference Include="..\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void Configure(IServiceProvider provider)
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.*" />
<PackageReference Include="MartinCostello.Logging.XUnit" />

<ProjectReference Include="..\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
Expand All @@ -14,7 +14,7 @@ public void ConfigureServices(IServiceCollection services)
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="Xunit.SkippableFact" />

<ProjectReference Include="..\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
Expand All @@ -19,7 +19,7 @@ Not support:
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="Xunit.StaFact" />

<ProjectReference Include="..\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public void ConfigureServices(IServiceCollection services)
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xRetry" Version="[1.9.0, 2.0.0)" />
<PackageReference Include="xunit.core" Version="[2.4.2, 3.0.0)" />
<PackageReference Include="xRetry" />
<PackageReference Include="xunit.core" />

<ProjectReference Include="..\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.1</TargetFrameworks>
Expand Down Expand Up @@ -36,8 +36,8 @@ Release notes:
<InternalsVisibleTo Include="Xunit.DependencyInjection.StaFact" />
<InternalsVisibleTo Include="Xunit.DependencyInjection.Test" />

<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="xunit.extensibility.execution" Version="[2.4.2, 3.0.0)" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="xunit.extensibility.execution" />

<ProjectReference Include="..\Xunit.DependencyInjection.Analyzer\Xunit.DependencyInjection.Analyzer.csproj" PrivateAssets="All" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions test/TestPackages.targets
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="xunit" Version="2.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

<PackageReference Include="Microsoft.CodeAnalysis" Version="4.*" />
<PackageReference Include="Microsoft.CodeAnalysis" />

<!--https://github.com/dotnet/roslyn-sdk/blob/main/src/Microsoft.CodeAnalysis.Testing/README.md-->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.*" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.*" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.*" />
<!-- https://github.com/dotnet/roslyn-sdk/blob/main/src/Microsoft.CodeAnalysis.Testing/README.md -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<Import Project="..\..\src\Xunit.DependencyInjection\Xunit.DependencyInjection.targets" />
<Import Project="..\TestPackages.targets" />

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="System.ValueTuple" />
</ItemGroup>

<ItemGroup>
<Compile Include="AssemblyNamespaceTest.fs" />
<Compile Include="ModuleTest.fs" />
Expand All @@ -23,9 +28,6 @@
<Compile Include="ScopedTest.fs" />
<Compile Include="Program.fs" />

<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.*" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
<PackageReference Include="System.ValueTuple" Version="4.*" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />

<ProjectReference Include="..\..\src\Xunit.DependencyInjection\Xunit.DependencyInjection.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

<None Update="appsettings.json" CopyToOutputDirectory="PreserveNewest" />

<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.*" />
<PackageReference Include="FluentAssertions" Version="6.*" />
<PackageReference Include="FSharp.Core" Version="8.*" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" />
<PackageReference Include="FluentAssertions" />
<PackageReference Include="FSharp.Core" />

<ProjectReference Include="..\..\src\Xunit.DependencyInjection.Demystifier\Xunit.DependencyInjection.Demystifier.csproj" />
<ProjectReference Include="..\Xunit.DependencyInjection.FakeTest\Xunit.DependencyInjection.FakeTest.csproj" />
Expand Down