Skip to content

Commit 3e45d93

Browse files
seesharperseesharper
committed
Merge branch 'master' into feature/better-init
2 parents 3306990 + c0b7cdf commit 3e45d93

File tree

15 files changed

+470
-360
lines changed

15 files changed

+470
-360
lines changed

‎Dotnet.Script.sln

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.DependencyMod
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.DependencyModel.NuGet", "src\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj", "{E361528F-178A-4489-AF01-FFD3A7122D99}"
1616
EndProject
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dotnet.Script.Desktop.Tests", "src\Dotnet.Script.Desktop.Tests\Dotnet.Script.Desktop.Tests.csproj", "{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}"
18+
EndProject
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dotnet.Script.Shared.Tests", "src\Dotnet.Script.Shared.Tests\Dotnet.Script.Shared.Tests.csproj", "{8FFA2816-411E-437C-AB75-FFA546780E7A}"
20+
EndProject
21+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F20002BB-970C-4318-B618-58D478CAC405}"
22+
EndProject
1723
Global
1824
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1925
Debug|Any CPU = Debug|Any CPU
@@ -96,10 +102,39 @@ Global
96102
{E361528F-178A-4489-AF01-FFD3A7122D99}.Release|x64.Build.0 = Release|Any CPU
97103
{E361528F-178A-4489-AF01-FFD3A7122D99}.Release|x86.ActiveCfg = Release|Any CPU
98104
{E361528F-178A-4489-AF01-FFD3A7122D99}.Release|x86.Build.0 = Release|Any CPU
105+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Debug|Any CPU.Build.0 = Debug|Any CPU
107+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Debug|x64.ActiveCfg = Debug|Any CPU
108+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Debug|x64.Build.0 = Debug|Any CPU
109+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Debug|x86.ActiveCfg = Debug|Any CPU
110+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Debug|x86.Build.0 = Debug|Any CPU
111+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Release|Any CPU.ActiveCfg = Release|Any CPU
112+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Release|Any CPU.Build.0 = Release|Any CPU
113+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Release|x64.ActiveCfg = Release|Any CPU
114+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Release|x64.Build.0 = Release|Any CPU
115+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Release|x86.ActiveCfg = Release|Any CPU
116+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}.Release|x86.Build.0 = Release|Any CPU
117+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
119+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Debug|x64.ActiveCfg = Debug|Any CPU
120+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Debug|x64.Build.0 = Debug|Any CPU
121+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
122+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Debug|x86.Build.0 = Debug|Any CPU
123+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
124+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Release|Any CPU.Build.0 = Release|Any CPU
125+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Release|x64.ActiveCfg = Release|Any CPU
126+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Release|x64.Build.0 = Release|Any CPU
127+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Release|x86.ActiveCfg = Release|Any CPU
128+
{8FFA2816-411E-437C-AB75-FFA546780E7A}.Release|x86.Build.0 = Release|Any CPU
99129
EndGlobalSection
100130
GlobalSection(SolutionProperties) = preSolution
101131
HideSolutionNode = FALSE
102132
EndGlobalSection
133+
GlobalSection(NestedProjects) = preSolution
134+
{ADA5A9A5-CBE9-48DA-8C71-318574C986C8} = {F20002BB-970C-4318-B618-58D478CAC405}
135+
{B0E5959C-6E7F-4023-96BA-5AD4A5E00541} = {F20002BB-970C-4318-B618-58D478CAC405}
136+
{8FFA2816-411E-437C-AB75-FFA546780E7A} = {F20002BB-970C-4318-B618-58D478CAC405}
137+
EndGlobalSection
103138
GlobalSection(ExtensibilityGlobals) = postSolution
104139
SolutionGuid = {3B983DCE-42D8-48BE-BCC9-CDE81001EBDA}
105140
EndGlobalSection

‎README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
# dotnet script
22

3-
Run C# scripts from the .NET CLI.
3+
Run C# scripts from the .NET CLI.
44

55
## Build status
66

77
| Build server | Platform | Build status |
88
| ------------ | ----------- | ---------------------------------------- |
99
| AppVeyor | Windows | [![](https://img.shields.io/appveyor/ci/filipw/dotnet-script/master.svg)](https://ci.appveyor.com/project/filipw/dotnet-script/branch/master) |
10-
| Travis | Linux/ OS X | [![](https://travis-ci.org/filipw/dotnet-script.svg?branch=master)](https://travis-ci.org/filipw/dotnet-script) |
10+
| Travis | Linux / OS X | [![](https://travis-ci.org/filipw/dotnet-script.svg?branch=master)](https://travis-ci.org/filipw/dotnet-script) |
11+
12+
13+
## Nuget Packages
14+
15+
| Name | Version | Framework | Description
16+
| --------| ---------------------------------------- | ---------- |-------
17+
| `dotnet-script` | [![Nuget](http://img.shields.io/nuget/v/dotnet-script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet-script/) | `netcoreapp2.1` / `netcoreapp2.0` | .NET Core global tool
18+
| `Dotnet.Script`| [![Nuget](http://img.shields.io/nuget/v/dotnet.script.svg?maxAge=10800)](https://www.nuget.org/packages/dotnet.script/) | `netcoreapp2.1` / `netcoreapp2.0` | .NET Core project tool
19+
| `Dotnet.Script.Core` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.Core.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.Core/) | `netstandard2.0` | Core library for hosting dotnet-script logic in your own app.
20+
| `Dotnet.Script.DependencyModel` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.DependencyModel.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.DependencyModel/) | `netstandard2.0` / `net46` | Provides runtime and compilation dependency resolution for dotnet-script based scripts.
21+
| `Dotnet.Script.DependencyModel.Nuget` | [![Nuget](http://img.shields.io/nuget/v/Dotnet.Script.DependencyModel.Nuget.svg?maxAge=10800)](https://www.nuget.org/packages/Dotnet.Script.DependencyModel.Nuget/) | `netstandard2.0` / `net46` | A null implementation of a `MetadataReferenceResolver` that allows inline nuget references to be specified in script (csx) files.
1122

1223
## Installing
1324

‎build/Build.csx

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,45 @@ using static ChangeLog;
99
using static FileUtils;
1010
using System.Xml.Linq;
1111

12+
DotNet.Build(dotnetScriptProjectFolder);
13+
DotNet.Test(testProjectFolder);
1214

15+
// desktop CLR tests should only run on Windows
16+
// we can run them on Mono in the future using the xunit runner instead of dotnet test
17+
if (BuildEnvironment.IsWindows)
18+
{
19+
DotNet.Test(testDesktopProjectFolder);
20+
}
1321

14-
DotNet.Build(DotnetScriptProjectFolder);
15-
DotNet.Test(TestProjectFolder);
16-
DotNet.Publish(DotnetScriptProjectFolder, PublishArtifactsFolder, NetCoreApp20);
22+
DotNet.Publish(dotnetScriptProjectFolder, publishArtifactsFolder, NetCoreApp20);
1723

1824
// We only publish packages from Windows/AppVeyor
1925
if (BuildEnvironment.IsWindows)
2026
{
2127

2228
using(var globalToolBuildFolder = new DisposableFolder())
2329
{
24-
Copy(SolutionFolder, globalToolBuildFolder.Path);
30+
Copy(solutionFolder, globalToolBuildFolder.Path);
2531
PatchTargetFramework(globalToolBuildFolder.Path, NetCoreApp21);
2632
PatchPackAsTool(globalToolBuildFolder.Path);
2733
PatchPackageId(globalToolBuildFolder.Path, GlobalToolPackageId);
2834
PatchContent(globalToolBuildFolder.Path);
29-
DotNet.Pack(Path.Combine(globalToolBuildFolder.Path,"Dotnet.Script"),NuGetArtifactsFolder);
35+
DotNet.Pack(Path.Combine(globalToolBuildFolder.Path,"Dotnet.Script"), nuGetArtifactsFolder);
3036
}
3137

3238
using(var nugetPackageBuildFolder = new DisposableFolder())
3339
{
34-
Copy(SolutionFolder, nugetPackageBuildFolder.Path);
40+
Copy(solutionFolder, nugetPackageBuildFolder.Path);
3541
PatchTargetFramework(nugetPackageBuildFolder.Path, NetCoreApp20);
36-
DotNet.Pack(Path.Combine(nugetPackageBuildFolder.Path,"Dotnet.Script"),NuGetArtifactsFolder);
42+
DotNet.Pack(Path.Combine(nugetPackageBuildFolder.Path,"Dotnet.Script"), nuGetArtifactsFolder);
3743
}
3844

39-
DotNet.Pack(DotnetScriptCoreProjectFolder, NuGetArtifactsFolder);
40-
DotNet.Pack(DotnetScriptDependencyModelProjectFolder, NuGetArtifactsFolder);
41-
DotNet.Pack(DotnetScriptDependencyModelNuGetProjectFolder, NuGetArtifactsFolder);
45+
DotNet.Pack(dotnetScriptCoreProjectFolder, nuGetArtifactsFolder);
46+
DotNet.Pack(dotnetScriptDependencyModelProjectFolder, nuGetArtifactsFolder);
47+
DotNet.Pack(dotnetScriptDependencyModelNuGetProjectFolder, nuGetArtifactsFolder);
4248

43-
Choco.Pack(DotnetScriptProjectFolder, PublishArtifactsFolder, ChocolateyArtifactsFolder);
44-
Zip(PublishArchiveFolder, PathToGitHubReleaseAsset);
49+
Choco.Pack(dotnetScriptProjectFolder, publishArtifactsFolder, chocolateyArtifactsFolder);
50+
Zip(publishArchiveFolder, pathToGitHubReleaseAsset);
4551

4652
if (BuildEnvironment.IsSecure)
4753
{
@@ -50,23 +56,23 @@ if (BuildEnvironment.IsWindows)
5056
if (Git.Default.IsTagCommit())
5157
{
5258
Git.Default.RequreCleanWorkingTree();
53-
await ReleaseManagerFor(Owner,ProjectName,BuildEnvironment.GitHubAccessToken)
54-
.CreateRelease(Git.Default.GetLatestTag(), PathToReleaseNotes, new [] { new ZipReleaseAsset(PathToGitHubReleaseAsset) });
55-
NuGet.TryPush(NuGetArtifactsFolder);
56-
Choco.TryPush(ChocolateyArtifactsFolder, BuildEnvironment.ChocolateyApiKey);
59+
await ReleaseManagerFor(owner, projectName,BuildEnvironment.GitHubAccessToken)
60+
.CreateRelease(Git.Default.GetLatestTag(), pathToReleaseNotes, new [] { new ZipReleaseAsset(pathToGitHubReleaseAsset) });
61+
NuGet.TryPush(nuGetArtifactsFolder);
62+
Choco.TryPush(chocolateyArtifactsFolder, BuildEnvironment.ChocolateyApiKey);
5763
}
5864
}
5965
}
6066

6167
private async Task CreateReleaseNotes()
6268
{
6369
Logger.Log("Creating release notes");
64-
var generator = ChangeLogFrom(Owner, ProjectName, BuildEnvironment.GitHubAccessToken).SinceLatestTag();
70+
var generator = ChangeLogFrom(owner, projectName, BuildEnvironment.GitHubAccessToken).SinceLatestTag();
6571
if (!Git.Default.IsTagCommit())
6672
{
6773
generator = generator.IncludeUnreleased();
6874
}
69-
await generator.Generate(PathToReleaseNotes);
75+
await generator.Generate(pathToReleaseNotes);
7076
}
7177

7278
private void PatchTargetFramework(string solutionFolder, string targetFramework)

‎build/BuildContext.csx

Lines changed: 23 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,35 @@ using static FileUtils;
33
using System.Xml.Linq;
44

55
const string NetCoreApp20 = "netcoreapp2.0";
6-
76
const string NetCoreApp21 = "netcoreapp2.1";
8-
97
const string GlobalToolPackageId = "dotnet-script";
108

11-
string Version;
12-
13-
string GitHubArtifactsFolder;
14-
15-
string GitHubReleaseAsset;
16-
17-
string GitHubReleaseNoteAsset;
18-
19-
string NuGetArtifactsFolder;
20-
21-
string ChocolateyArtifactsFolder;
22-
23-
string PublishArtifactsFolder;
24-
25-
string PublishArchiveFolder;
26-
27-
string SolutionFolder;
28-
29-
string DotnetScriptProjectFolder;
30-
31-
string DotnetScriptCoreProjectFolder;
32-
33-
string DotnetScriptDependencyModelProjectFolder;
34-
35-
string DotnetScriptDependencyModelNuGetProjectFolder;
36-
37-
string Root;
38-
39-
string TestProjectFolder;
40-
41-
string PathToReleaseNotes;
42-
43-
string PathToGitHubReleaseAsset;
44-
45-
string Owner;
46-
47-
string ProjectName;
48-
49-
Owner = "filipw";
50-
ProjectName = "dotnet-script";
51-
Root = FileUtils.GetScriptFolder();
52-
SolutionFolder = Path.Combine(Root,"..","src");
53-
DotnetScriptProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script");
54-
DotnetScriptCoreProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.Core");
55-
DotnetScriptDependencyModelProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.DependencyModel");
56-
DotnetScriptDependencyModelNuGetProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.DependencyModel.NuGet");
57-
TestProjectFolder = Path.Combine(Root, "..", "src", "Dotnet.Script.Tests");
58-
59-
var artifactsFolder = CreateDirectory(Root, "Artifacts");
60-
GitHubArtifactsFolder = CreateDirectory(artifactsFolder, "GitHub");
61-
NuGetArtifactsFolder = CreateDirectory(artifactsFolder, "NuGet");
62-
ChocolateyArtifactsFolder = CreateDirectory(artifactsFolder, "Chocolatey");
63-
PublishArtifactsFolder = CreateDirectory(artifactsFolder, "Publish", ProjectName);
64-
PublishArchiveFolder = Path.Combine(PublishArtifactsFolder, "..");
65-
66-
PathToReleaseNotes = Path.Combine(GitHubArtifactsFolder, "ReleaseNotes.md");
67-
68-
Version = ReadVersion();
69-
70-
PathToGitHubReleaseAsset = Path.Combine(GitHubArtifactsFolder, $"{ProjectName}.{Version}.zip");
9+
var owner = "filipw";
10+
var projectName = "dotnet-script";
11+
var root = FileUtils.GetScriptFolder();
12+
var solutionFolder = Path.Combine(root,"..","src");
13+
var dotnetScriptProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script");
14+
var dotnetScriptCoreProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Core");
15+
var dotnetScriptDependencyModelProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.DependencyModel");
16+
var dotnetScriptDependencyModelNuGetProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.DependencyModel.NuGet");
17+
var testProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Tests");
18+
var testDesktopProjectFolder = Path.Combine(root, "..", "src", "Dotnet.Script.Desktop.Tests");
19+
20+
var artifactsFolder = CreateDirectory(root, "Artifacts");
21+
var gitHubArtifactsFolder = CreateDirectory(artifactsFolder, "GitHub");
22+
var nuGetArtifactsFolder = CreateDirectory(artifactsFolder, "NuGet");
23+
var chocolateyArtifactsFolder = CreateDirectory(artifactsFolder, "Chocolatey");
24+
var publishArtifactsFolder = CreateDirectory(artifactsFolder, "Publish", projectName);
25+
var publishArchiveFolder = Path.Combine(publishArtifactsFolder, "..");
26+
var pathToReleaseNotes = Path.Combine(gitHubArtifactsFolder, "ReleaseNotes.md");
27+
28+
var version = ReadVersion();
29+
30+
var pathToGitHubReleaseAsset = Path.Combine(gitHubArtifactsFolder, $"{projectName}.{version}.zip");
7131

7232
string ReadVersion()
7333
{
74-
var projectFile = XDocument.Load(Directory.GetFiles(DotnetScriptProjectFolder, "*.csproj").Single());
34+
var projectFile = XDocument.Load(Directory.GetFiles(dotnetScriptProjectFolder, "*.csproj").Single());
7535
var versionPrefix = projectFile.Descendants("VersionPrefix").SingleOrDefault()?.Value;
7636
var versionSuffix = projectFile.Descendants("VersionSuffix").SingleOrDefault()?.Value;
7737

‎build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.0.0-sdk as builder
1+
FROM microsoft/dotnet:2.1-sdk as builder
22
COPY . /dotnet-script
33
WORKDIR /dotnet-script
44

@@ -21,4 +21,4 @@ COPY --from=builder /dotnet-script/src/Dotnet.Script/bin/Release/netcoreapp2.0/p
2121

2222
WORKDIR /scripts
2323

24-
ENTRYPOINT ["dotnet", "/dotnet-script/dotnet-script.dll"]
24+
ENTRYPOINT ["dotnet", "/dotnet-script/dotnet-script.dll"]

‎src/Dotnet.Script.Core/ScriptCompiler.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,21 @@ public virtual ScriptOptions CreateScriptOptions(ScriptContext context, IList<Ru
7676
.WithEmitDebugInformation(true)
7777
.WithFileEncoding(context.Code.Encoding);
7878

79+
// if the framework is not Core CLR, add GAC references
80+
if (!ScriptEnvironment.Default.IsNetCore)
81+
{
82+
opts = opts.AddReferences(
83+
"System",
84+
"System.Core",
85+
"System.Data",
86+
"System.Data.DataSetExtensions",
87+
"System.Runtime",
88+
"System.Xml",
89+
"System.Xml.Linq",
90+
"System.Net.Http",
91+
"Microsoft.CSharp");
92+
}
93+
7994
if (!string.IsNullOrWhiteSpace(context.FilePath))
8095
{
8196
opts = opts.WithFilePath(context.FilePath);

‎src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Dotnet.Script.DependencyModel.Environment
88
{
99
public class ScriptEnvironment
1010
{
11-
private static readonly Lazy<ScriptEnvironment> _default = new Lazy<ScriptEnvironment>(() => new ScriptEnvironment());
11+
public static readonly ScriptEnvironment Default = new ScriptEnvironment();
1212

1313
private readonly Lazy<string> _targetFramework;
1414

@@ -22,7 +22,7 @@ public class ScriptEnvironment
2222

2323
private readonly Lazy<string> _nuGetStoreFolder;
2424

25-
public static ScriptEnvironment Default => _default.Value;
25+
private string _overrriddenTargetFramework;
2626

2727
private ScriptEnvironment()
2828
{
@@ -40,14 +40,26 @@ private ScriptEnvironment()
4040

4141
public string RuntimeIdentifier => _runtimeIdentifier.Value;
4242

43-
public string TargetFramework => _targetFramework.Value;
43+
public string TargetFramework => _overrriddenTargetFramework ?? _targetFramework.Value;
4444

4545
public string InstallLocation => _installLocation.Value;
4646

4747
public string ProccessorArchitecture => RuntimeEnvironment.RuntimeArchitecture;
4848

4949
public string NuGetStoreFolder => _nuGetStoreFolder.Value;
5050

51+
public bool IsNetCore => TargetFramework.StartsWith("netcoreapp", StringComparison.InvariantCultureIgnoreCase);
52+
53+
public void OverrideTargetFramework(string targetFramework)
54+
{
55+
if (_targetFramework.IsValueCreated)
56+
{
57+
throw new InvalidOperationException($"Cannot override target framework because a value {_targetFramework.Value} has already been resolved and used.");
58+
}
59+
60+
_overrriddenTargetFramework = targetFramework;
61+
}
62+
5163
private static string GetPlatformIdentifier()
5264
{
5365
if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Darwin) return "osx";

‎src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net461</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
9+
<PackageReference Include="xunit" Version="2.3.1" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
11+
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />
16+
<ProjectReference Include="..\Dotnet.Script.DependencyModel\Dotnet.Script.DependencyModel.csproj" />
17+
<ProjectReference Include="..\Dotnet.Script.Shared.Tests\Dotnet.Script.Shared.Tests.csproj" />
18+
</ItemGroup>
19+
20+
</Project>

‎src/Dotnet.Script.Desktop.Tests/InteractiveRunnerTests.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using Xunit;
2+
using Dotnet.Script.DependencyModel.Environment;
3+
using Dotnet.Script.Shared.Tests;
4+
5+
namespace Dotnet.Script.Desktop.Tests
6+
{
7+
[Collection("IntegrationTests")]
8+
public class InteractiveRunnerTests : InteractiveRunnerTestsBase
9+
{
10+
public InteractiveRunnerTests()
11+
{
12+
ScriptEnvironment.Default.OverrideTargetFramework("net461");
13+
}
14+
}
15+
}

0 commit comments

Comments
 (0)