Skip to content

Commit 021985b

Browse files
committed
moved test folder content to core within test folder
1 parent 7fba886 commit 021985b

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ src/Docker/**/content
124124
config.wyam.dll
125125
config.wyam.hash
126126
config.wyam.packages.xml
127-
/test/build
127+
/test/core/build

build/artifacts-test.cake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Task("Artifacts-DotnetTool-Test")
2929
}
3030
});
3131

32-
Task("Artifacts-MsBuild-Test")
33-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-MsBuild-Test can be tested only on Windows or Linux agents.")
34-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-MsBuild-Test works only on Releasing CI.")
32+
Task("Artifacts-MsBuildCore-Test")
33+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-MsBuildCore-Test can be tested only on Windows or Linux agents.")
34+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-MsBuildCore-Test works only on Releasing CI.")
3535
.IsDependentOn("Artifacts-Prepare")
3636
.Does<BuildParameters>((parameters) =>
3737
{
@@ -42,7 +42,7 @@ Task("Artifacts-MsBuild-Test")
4242
{
4343
var (os, distro, targetframework) = dockerImage;
4444

45-
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuild.ps1 -version {version} -repoPath {rootPrefix}/repo/test -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
45+
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/test/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
4646

4747
DockerTestArtifact(dockerImage, parameters, cmd);
4848
}
@@ -52,4 +52,4 @@ Task("Artifacts-Test")
5252
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Test can be tested only on Windows or Linux agents.")
5353
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-Test works only on Releasing CI.")
5454
.IsDependentOn("Artifacts-DotnetTool-Test")
55-
.IsDependentOn("Artifacts-MsBuild-Test");
55+
.IsDependentOn("Artifacts-MsBuildCore-Test");

test-scripts/Test-MsBuild.ps1 renamed to test-scripts/Test-MsBuildCore.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param(
88
$result = dotnet build $repoPath --source $nugetPath --source https://api.nuget.org/v3/index.json -p:GitVersionTaskVersion=$version -p:TargetFramework=$targetframework *>&1;
99

1010
if($LASTEXITCODE -eq 0) {
11-
& "dotnet" $repoPath/build/corefx/$targetframework/TestRepo.dll;
11+
& "dotnet" $repoPath/build/$targetframework/app.dll;
1212
} else {
1313
Write-Output $result
1414
}

test/Program.cs renamed to test/core/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Reflection;
33

4-
namespace TestRepo
4+
namespace App
55
{
66
class Program
77
{

test/TestRepoCore.csproj renamed to test/core/app.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<AssemblyName>TestRepo</AssemblyName>
6-
<RootNamespace>TestRepo</RootNamespace>
5+
<AssemblyName>app</AssemblyName>
6+
<RootNamespace>App</RootNamespace>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<GitVersionTaskVersion Condition=" '$(GitVersionTaskVersion)' == '' ">5.0.0-beta5.53</GitVersionTaskVersion>
9-
<OutputPath>.\build\corefx\</OutputPath>
9+
<OutputPath>.\build\</OutputPath>
1010
</PropertyGroup>
1111

1212
<Target Name="Git" DependsOnTargets="GetVersion">

0 commit comments

Comments
 (0)