Skip to content

Commit

Permalink
Merge branch 'master' into 450alpha2
Browse files Browse the repository at this point in the history
  • Loading branch information
OsirisTerje committed May 22, 2023
2 parents 258cb90 + 364f81e commit 4eda188
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/NUnit3TestAdapter.Cake.CI.yml
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.4.0
- uses: actions/setup-dotnet@v2
with:
dotnet-version: |
Expand Down
1 change: 0 additions & 1 deletion build.cake
Expand Up @@ -17,7 +17,6 @@ var version = "4.5.0";

var modifier = "-alpha.4";


var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
var packageVersion = version + modifier + dbgSuffix;
Information("Packageversion: "+packageVersion);
Expand Down
2 changes: 1 addition & 1 deletion nuget.config
Expand Up @@ -3,6 +3,6 @@
<packageSources>
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<!--<add key="Local" value="c:\nuget" />-->
<add key="Local" value="c:\nuget" />
</packageSources>
</configuration>
Expand Up @@ -11,9 +11,9 @@

<ItemGroup>
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitTestAdapter/NUnit.TestAdapter.csproj
Expand Up @@ -4,7 +4,7 @@
<AssemblyName>NUnit3.TestAdapter</AssemblyName>
<!--<AssemblyName>NUnit3.TestAdapterDebug</AssemblyName>-->
<RootNamespace>NUnit.VisualStudio.TestAdapter</RootNamespace>
<!--<TargetFramework>netcoreapp3.1</TargetFramework>-->
<TargetFramework>netcoreapp3.1</TargetFramework>
<!-- For testing and debugging-->
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
Expand Down
6 changes: 3 additions & 3 deletions src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj
Expand Up @@ -4,8 +4,8 @@
<IsTestProject>true</IsTestProject>
<RootNamespace>NUnit.VisualStudio.TestAdapter.Tests</RootNamespace>
<AssemblyName>NUnit.VisualStudio.TestAdapter.Tests</AssemblyName>
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<!--<TargetFrameworks>netcoreapp3.1</TargetFrameworks>-->
<!--<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>-->
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<!-- For testing and debugging-->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
Expand All @@ -16,7 +16,7 @@
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
Expand Down

0 comments on commit 4eda188

Please sign in to comment.