diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | IronScheme/IronScheme.Tests/IronScheme.Tests.csproj | 8 | ||||
| -rw-r--r-- | IronScheme/IronSchemeCore.sln | 3 | ||||
| -rw-r--r-- | IronScheme/build.cmd | 1 | ||||
| -rw-r--r-- | IronScheme/tools/nunit.framework.dll | bin | 151552 -> 0 bytes | |||
| -rw-r--r-- | appveyor.yml | 2 |
6 files changed, 7 insertions, 11 deletions
@@ -1,4 +1,4 @@ -AUTHORS +AUTHORS
IronScheme/IronScheme/Compiler/ironscheme.lex.cs
IronScheme/IronScheme/Compiler/IronScheme.y.cs
@@ -12,3 +12,5 @@ IronScheme/Oyster.IntX/Oyster.IntX.xml **/Migrated rules for*.ruleset
/IronScheme/.vs/*
*.csproj.user
+/.vs
+
diff --git a/IronScheme/IronScheme.Tests/IronScheme.Tests.csproj b/IronScheme/IronScheme.Tests/IronScheme.Tests.csproj index d87e2be8..a28efbb2 100644 --- a/IronScheme/IronScheme.Tests/IronScheme.Tests.csproj +++ b/IronScheme/IronScheme.Tests/IronScheme.Tests.csproj @@ -1,9 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <ProductVersion>9.0.30729</ProductVersion>
<TargetFramework>net20</TargetFramework>
- <FileUpgradeFlags />
- <UpgradeBackupLocation />
<AssemblyTitle>IronScheme.Tests</AssemblyTitle>
<Product>IronScheme.Tests</Product>
<Copyright>Copyright © 2016</Copyright>
@@ -18,9 +15,6 @@ <CodeAnalysisRuleSet />
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\tools\nunit.framework.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
+ <PackageReference Include="NUnit" Version="2.6.4" />
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/IronScheme/IronSchemeCore.sln b/IronScheme/IronSchemeCore.sln index a8e2f395..ed09fbed 100644 --- a/IronScheme/IronSchemeCore.sln +++ b/IronScheme/IronSchemeCore.sln @@ -31,7 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{06F93FA9 tools\Mono.Cecil.dll = tools\Mono.Cecil.dll
tools\Mono.Cecil.Pdb.dll = tools\Mono.Cecil.Pdb.dll
tools\NamespaceRenamer.exe = tools\NamespaceRenamer.exe
- tools\nunit.framework.dll = tools\nunit.framework.dll
tools\ReferenceRemover.exe = tools\ReferenceRemover.exe
tools\ShiftReduceParser.dll = tools\ShiftReduceParser.dll
EndProjectSection
@@ -59,7 +58,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronScheme.Tests", "IronSch EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronScheme.FrameworkPAL", "IronScheme.FrameworkPAL\IronScheme.FrameworkPAL.csproj", "{5A0F3FDD-C1E0-4DFB-B15B-0C4C17AA5D45}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronScheme.Tests.Extensions", "IronScheme.Tests.Extensions\IronScheme.Tests.Extensions.csproj", "{BAF7E08E-2C51-47B2-B828-734E63AB69E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronScheme.Tests.Extensions", "IronScheme.Tests.Extensions\IronScheme.Tests.Extensions.csproj", "{BAF7E08E-2C51-47B2-B828-734E63AB69E0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/IronScheme/build.cmd b/IronScheme/build.cmd index c0541b68..ee2585a6 100644 --- a/IronScheme/build.cmd +++ b/IronScheme/build.cmd @@ -8,6 +8,7 @@ if "%1" == "--help" goto help set CFG=%1 if "%CFG%" == "" set CFG=Release +dotnet restore IronSchemeCore.sln msbuild IronSchemeCore.sln /v:m /p:Configuration=%CFG% exit /B %ERRORLEVEL% diff --git a/IronScheme/tools/nunit.framework.dll b/IronScheme/tools/nunit.framework.dll Binary files differdeleted file mode 100644 index ed6550bb..00000000 --- a/IronScheme/tools/nunit.framework.dll +++ /dev/null diff --git a/appveyor.yml b/appveyor.yml index 00169911..3b9822aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ nuget: project_feed: true
build_script:
- cmd: |
- nuget restore "IronScheme\IronSchemeCore.sln"
+ dotnet restore "IronScheme\IronSchemeCore.sln"
echo 1 > IronScheme\IronScheme\Compiler\numberlexer.lex.cs
echo 1 > IronScheme\IronScheme\Compiler\ironscheme.lex.cs
echo 1 > IronScheme\IronScheme\Compiler\NumberParser.y.cs
|