Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc1d628f

Browse files
committed
replaced nuget.exe with dotnet pack for script package tests
1 parenta5f4438 commitc1d628f

File tree

8 files changed

+41
-14
lines changed

8 files changed

+41
-14
lines changed
-4.78 MB
Binary file not shown.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NuSpecFile>WithAnyTargetFramework.nuspec</NuSpecFile>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NuSpecFile>WithMainCsx.nuspec</NuSpecFile>
6+
</PropertyGroup>
7+
</Project>

‎src/Dotnet.Script.Tests/ScriptPackages/WithMainCsx/WithMainCsx.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package>
33
<metadata>
44
<id>ScriptPackageWithMainCsx</id>
55
<version>1.0.0</version>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NuSpecFile>WithNoEntryPointFile.nuspec</NuSpecFile>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NuSpecFile>WithScriptPackageDependency.nuspec</NuSpecFile>
6+
</PropertyGroup>
7+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ProjectSdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NuSpecFile>WithSubFolder.nuspec</NuSpecFile>
6+
</PropertyGroup>
7+
</Project>

‎src/Dotnet.Script.Tests/ScriptPackagesFixture.cs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,13 @@ private void BuildScriptPackages()
3535
RemoveDirectory(pathToPackagesOutputFolder);
3636
Directory.CreateDirectory(pathToPackagesOutputFolder);
3737
varspecFiles=GetSpecFiles();
38-
_=AppDomain.CurrentDomain.BaseDirectory;
39-
varpathtoNuget430=Path.Combine("../../../NuGet/NuGet430.exe");
4038
foreach(varspecFileinspecFiles)
4139
{
42-
stringcommand;
43-
if(_scriptEnvironment.IsWindows)
40+
varresult=ProcessHelper.RunAndCaptureOutput("dotnet",$"pack\"{specFile}\" -o\"{pathToPackagesOutputFolder}\"");
41+
if(result.ExitCode!=0)
4442
{
45-
command=pathtoNuget430;
46-
_=ProcessHelper.RunAndCaptureOutput(command,$"pack\"{specFile}\" -OutputDirectory\"{pathToPackagesOutputFolder}\"");
43+
thrownewInvalidOperationException($"Failed to pack{specFile}:{result.Output}");
4744
}
48-
else
49-
{
50-
command="mono";
51-
_=ProcessHelper.RunAndCaptureOutput(command,$"\"{pathtoNuget430}\" pack\"{specFile}\" -OutputDirectory\"{pathToPackagesOutputFolder}\"");
52-
}
53-
5445
}
5546
}
5647

@@ -91,7 +82,8 @@ private static IReadOnlyList<string> GetSpecFiles()
9182
{
9283
varbaseDirectory=AppDomain.CurrentDomain.BaseDirectory;
9384
varpathToScriptPackages=Path.Combine(baseDirectory,"..","..","..","ScriptPackages");
94-
returnDirectory.GetFiles(pathToScriptPackages,"*.nuspec",SearchOption.AllDirectories);
85+
// The csproj files contains the nuspec references
86+
returnDirectory.GetFiles(pathToScriptPackages,"*.csproj",SearchOption.AllDirectories);
9587
}
9688
}
9789
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp