Skip to content

Commit 33d2c59

Browse files
ig-sinicynig-sinicyn
committed
Merge branch 'CJ-Cleanup'
2 parents 4b46cd0 + b0ff806 commit 33d2c59

File tree

1,107 files changed

+980900
-981427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,107 files changed

+980900
-981427
lines changed

‎Blocks/nuget/CodeJam.Blocks.Icon.png‎

-2.39 KB
Binary file not shown.

‎Blocks/src/CodeJam.Blocks.csproj‎

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

‎Blocks/tests/CodeJam.Blocks-Tests.csproj‎

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

‎Build/Build.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net472</TargetFramework>
4+
</PropertyGroup>
5+
</Project>

Build/CodeJam.AppVeyor.MsTest.Tests.ps1 renamed to Build/BuildScripts/CodeJam.AppVeyor.MsTest.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$include = "*-tests.MSTest.dll"
1+
$include = "*.Tests.MSTest.dll"
22

33
#run .net tests
44
$a = (gci -include $include -r | `
5-
where { $_.fullname -match "\\bin\\Publish\\net\d" } | `
5+
where { $_.fullname -match "\\bin\\Release\\net\d" } | `
66
select -ExpandProperty FullName)
77
echo "vstest.console /logger:Appveyor $a /Platform:x86"
88
&"vstest.console" /logger:Appveyor $a /Platform:x86
@@ -11,7 +11,7 @@ if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
1111
#run .net core tests
1212
# waiting for https://github.com/Microsoft/vstest/issues/1128
1313
#$a = (gci -include $include -r | `
14-
# where { $_.fullname -match "\\bin\\Publish\\netcore" } | `
14+
# where { $_.fullname -match "\\bin\\Release\\netcore" } | `
1515
# select -ExpandProperty FullName)
1616
#
1717
#$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\netcore_mstest_results.xml"

Build/CodeJam.AppVeyor.NUnit.Tests.ps1 renamed to Build/BuildScripts/CodeJam.AppVeyor.NUnit.Tests.ps1

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
$include = "*-tests.dll", "*-tests.NUnit.dll"
2-
$includePerfTests = "*-tests.performance.dll"
3-
$exclude = "Experimental\\.*?\\CodeJam-Tests.Performance.dll"
1+
$include = "*.Tests.dll", "*.Tests.NUnit.dll"
2+
$includePerfTests = "*.Tests.Performance.dll"
3+
$exclude = "Experimental\\.*?\\CodeJam.Tests.Performance.dll"
44

55
$wc = New-Object System.Net.WebClient
66

77
#run .net tests
88
$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\net_nunit_results.xml"
99
$a = (gci -include $include -r | `
10-
where { $_.fullname -match "\\bin\\Publish\\net\d" -and $_.fullname -notmatch $exclude } | `
10+
where { $_.fullname -match "\\bin\\Release\\net\d" -and $_.fullname -notmatch $exclude } | `
1111
select -ExpandProperty FullName)
1212
echo "nunit3-console $a --result=$logFileName"
1313
&"nunit3-console" $a "--result=$logFileName"
@@ -20,23 +20,23 @@ if ($LastExitCode -ne 0) {
2020
}
2121

2222
#run .net perftests
23-
$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\net_perftest_nunit_results.xml"
24-
$a = (gci -include $includePerfTests -r | `
25-
where { $_.fullname -match "\\bin\\Publish\\net\d" -and $_.fullname -notmatch $exclude } | `
26-
select -ExpandProperty FullName)
27-
echo "nunit3-console $a --result=$logFileName" --agents=1
28-
&"nunit3-console" $a "--result=$logFileName" --agents=1
29-
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
30-
echo "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName"
31-
$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", "$logFileName")
32-
if ($LastExitCode -ne 0) {
33-
echo "FAIL: UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName"
34-
$host.SetShouldExit($LastExitCode)
35-
}
23+
#$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\net_perftest_nunit_results.xml"
24+
#$a = (gci -include $includePerfTests -r | `
25+
# where { $_.fullname -match "\\bin\\Release\\net\d" -and $_.fullname -notmatch $exclude } | `
26+
# select -ExpandProperty FullName)
27+
#echo "nunit3-console $a --result=$logFileName" --agents=1
28+
#&"nunit3-console" $a "--result=$logFileName" --agents=1
29+
#if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
30+
#echo "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName"
31+
#$wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", "$logFileName")
32+
#if ($LastExitCode -ne 0) {
33+
# echo "FAIL: UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName"
34+
# $host.SetShouldExit($LastExitCode)
35+
#}
3636

3737
#run .net core tests
3838
$a = (gci -include $include -r | `
39-
where { $_.fullname -match "\\bin\\Publish\\netcore" -and $_.fullname -notmatch $exclude } | `
39+
where { $_.fullname -match "\\bin\\Release\\netcore" -and $_.fullname -notmatch $exclude } | `
4040
select -ExpandProperty FullName)
4141

4242
$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\netcore_nunit_results.xml"

Build/CodeJam.AppVeyor.xUnit.Tests.ps1 renamed to Build/BuildScripts/CodeJam.AppVeyor.xUnit.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
$include = "*-tests.xUnit.dll"
1+
$include = "*.Tests.xUnit.dll"
22

33
#run .net tests
44
$a = (gci -include $include -r | `
5-
where { $_.fullname -match "\\bin\\Publish\\net\d" } | `
5+
where { $_.fullname -match "\\bin\\Release\\net\d" } | `
66
select -ExpandProperty FullName)
77
echo "$env:xunit20\xunit.console $a -appveyor"
88
&"$env:xunit20\xunit.console" $a -appveyor
99
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
1010

1111
#run .net core tests
1212
$a = (gci -include $include -r | `
13-
where { $_.fullname -match "\\bin\\Publish\\netcore" } | `
13+
where { $_.fullname -match "\\bin\\Release\\netcore" } | `
1414
select -ExpandProperty FullName)
1515

1616
$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\netcore_xunit_results.xml"

Main/nuget/Push.bat renamed to Build/BuildScripts/CodeJam.Main.Push.bat

File renamed without changes.

‎Build/CodeJam.AppVeyor.FixVersionProps.ps1‎

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

‎Build/CodeJam.Default.props‎

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

0 commit comments

Comments
 (0)