1
- using System ;
2
1
using System . IO ;
3
2
using System . Linq ;
4
3
using System . Text ;
9
8
using Cake . Common . IO ;
10
9
using Cake . Common . Net ;
11
10
using Cake . Common . Tools . DotNet ;
11
+ using Cake . Common . Tools . DotNet . Build ;
12
12
using Cake . Common . Tools . DotNet . MSBuild ;
13
+ using Cake . Common . Tools . DotNet . Pack ;
13
14
using Cake . Common . Tools . DotNet . Restore ;
14
15
using Cake . Common . Tools . DotNet . Run ;
15
- using Cake . Common . Tools . DotNetCore . Build ;
16
- using Cake . Common . Tools . DotNetCore . MSBuild ;
17
- using Cake . Common . Tools . DotNetCore . Pack ;
18
- using Cake . Common . Tools . DotNetCore . Test ;
16
+ using Cake . Common . Tools . DotNet . Test ;
19
17
using Cake . Core ;
20
18
using Cake . Core . IO ;
21
19
using Cake . FileHelpers ;
@@ -59,8 +57,8 @@ public class BuildContext : FrostingContext
59
57
public FilePath IntegrationTestsProjectFile { get ; }
60
58
public FilePath TemplatesTestsProjectFile { get ; }
61
59
public FilePathCollection AllPackableSrcProjects { get ; }
62
-
63
- public DotNetCoreMSBuildSettings MsBuildSettings { get ; }
60
+
61
+ public DotNetMSBuildSettings MsBuildSettings { get ; }
64
62
65
63
private IAppVeyorProvider AppVeyor => this . BuildSystem ( ) . AppVeyor ;
66
64
public bool IsRunningOnAppVeyor => AppVeyor . IsRunningOnAppVeyor ;
@@ -103,7 +101,7 @@ public BuildContext(ICakeContext context)
103
101
AllPackableSrcProjects = new FilePathCollection ( context . GetFiles ( RootDirectory . FullPath + "/src/**/*.csproj" )
104
102
. Where ( p => ! p . FullPath . Contains ( "Disassembler" ) ) ) ;
105
103
106
- MsBuildSettings = new DotNetCoreMSBuildSettings
104
+ MsBuildSettings = new DotNetMSBuildSettings
107
105
{
108
106
MaxCpuCount = 1
109
107
} ;
@@ -118,9 +116,9 @@ public BuildContext(ICakeContext context)
118
116
}
119
117
}
120
118
121
- private DotNetCoreTestSettings GetTestSettingsParameters ( FilePath logFile , string tfm )
119
+ private DotNetTestSettings GetTestSettingsParameters ( FilePath logFile , string tfm )
122
120
{
123
- var settings = new DotNetCoreTestSettings
121
+ var settings = new DotNetTestSettings
124
122
{
125
123
Configuration = BuildConfiguration ,
126
124
Framework = tfm ,
@@ -318,7 +316,7 @@ public class BuildTask : FrostingTask<BuildContext>
318
316
{
319
317
public override void Run ( BuildContext context )
320
318
{
321
- context . DotNetBuild ( context . SolutionFile . FullPath , new DotNetCoreBuildSettings
319
+ context . DotNetBuild ( context . SolutionFile . FullPath , new DotNetBuildSettings
322
320
{
323
321
Configuration = context . BuildConfiguration ,
324
322
NoRestore = true ,
@@ -398,14 +396,14 @@ public override bool ShouldRun(BuildContext context)
398
396
399
397
public override void Run ( BuildContext context )
400
398
{
401
- var settingsSrc = new DotNetCorePackSettings
399
+ var settingsSrc = new DotNetPackSettings
402
400
{
403
401
Configuration = context . BuildConfiguration ,
404
402
OutputDirectory = context . ArtifactsDirectory . FullPath ,
405
403
ArgumentCustomization = args => args . Append ( "--include-symbols" ) . Append ( "-p:SymbolPackageFormat=snupkg" ) ,
406
404
MSBuildSettings = context . MsBuildSettings
407
405
} ;
408
- var settingsTemplate = new DotNetCorePackSettings
406
+ var settingsTemplate = new DotNetPackSettings
409
407
{
410
408
Configuration = context . BuildConfiguration ,
411
409
OutputDirectory = context . ArtifactsDirectory . FullPath ,
0 commit comments