Skip to content

Commit 0f2c7cc

Browse files
committed
Merge and update
1 parent 62d84f5 commit 0f2c7cc

File tree

5 files changed

+18
-51
lines changed

5 files changed

+18
-51
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ updates:
88
- package-ecosystem: "nuget" # See documentation for possible values
99
directory: "/" # Location of package manifests
1010
schedule:
11-
interval: "daily"
11+
interval: "weekly"
12+
ignore:
13+
- dependency-name: "NUnit3TestAdapter"
1214
commit-message:
1315
prefix: "[Dependabot]"
1416

.github/workflows/ci-build.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

CodeArtEng.Controls.UnitTests/CodeArtEng.Controls.UnitTests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" />
34
<Import Project="../packages/NUnit.4.3.2/build/NUnit.props" Condition="Exists('../packages/NUnit.4.3.2/build/NUnit.props')" />
45
<Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
5-
<Import Project="..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props')" />
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
77
<PropertyGroup>
88
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -87,6 +87,7 @@
8787
<Compile Include="Properties\AssemblyInfo.cs" />
8888
</ItemGroup>
8989
<ItemGroup>
90+
<None Include="app.config" />
9091
<None Include="packages.config" />
9192
</ItemGroup>
9293
<ItemGroup>
@@ -100,9 +101,9 @@
100101
<PropertyGroup>
101102
<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>
102103
</PropertyGroup>
103-
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props'))" />
104104
<Error Condition="!Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\build\NUnit.props'))" />
105105
<Error Condition="!Exists('../packages/NUnit.4.3.2/build/NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '../packages/NUnit.4.3.2/build/NUnit.props'))" />
106+
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props'))" />
106107
</Target>
107108
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
108109
Other similar extension points exist, see Microsoft.Common.targets.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

CodeArtEng.Controls.UnitTests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NUnit" version="4.3.2" targetFramework="net472" />
4-
<package id="NUnit3TestAdapter" version="4.5.0" targetFramework="net472" />
4+
<package id="NUnit3TestAdapter" version="4.6.0" targetFramework="net472" />
55
<package id="System.Buffers" version="4.6.0" targetFramework="net472" />
66
<package id="System.Memory" version="4.6.0" targetFramework="net472" />
77
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net472" />

0 commit comments

Comments
 (0)