From 983d5fdf9a47940789a5b7c32264096d477260fc Mon Sep 17 00:00:00 2001 From: Anton Bagliy <taccessviolation@gmail.com> Date: Mon, 26 Aug 2019 19:25:10 +0300 Subject: [PATCH] FIX: switch to .NET 4.0, add NUNit.ConsoleRunner, NUnit3TestAdapter to run tests from VS --- Compilers.sln | 28 +++++++++++++------ Module1/App.config | 6 ++-- Module1/Lexer.csproj | 8 ++++-- Module2/SimpleLangLexer/SimpleLexer.csproj | 3 +- .../SimpleLexerDemo/SimpleLexerDemo.csproj | 6 +++- Module3/GeneratedLexer.csproj | 4 ++- .../RecursiveDescentParser.csproj | 3 +- .../RecursiveDescentParserDemo.csproj | 11 ++++++-- Module5/GeneratedParser.csproj | 26 +++++++++++++++-- Module6/ParserAST.csproj | 24 ++++++++++++++-- Module6/packages.config | 2 +- Module7/ParserVistors.csproj | 26 +++++++++++++++-- Module8/ParserGenerator.csproj | 26 +++++++++++++++-- TestASTParser/TestASTParser.csproj | 17 +++++++---- TestASTParser/packages.config | 4 ++- TestCodeGenerator/TestCodeGenerator.csproj | 18 +++++++----- TestCodeGenerator/packages.config | 4 ++- TestDescentParser/TestDescentParser.csproj | 24 +++++++++------- TestDescentParser/packages.config | 4 ++- TestGeneratedLexer/TestGeneratedLexer.csproj | 18 +++++++----- TestGeneratedLexer/packages.config | 4 ++- .../TestGeneratedParser.csproj | 24 +++++++++------- TestGeneratedParser/packages.config | 4 ++- TestLexer/TestLexer.csproj | 18 +++++++----- TestLexer/packages.config | 4 ++- TestSimpleLexer/TestSimpleLexer.csproj | 18 +++++++----- TestSimpleLexer/packages.config | 4 ++- TestVisitors/TestVisitors.csproj | 24 +++++++++------- TestVisitors/packages.config | 4 ++- 29 files changed, 266 insertions(+), 100 deletions(-) diff --git a/Compilers.sln b/Compilers.sln index 16545cc..10baea4 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -1,5 +1,8 @@ п»ї Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29025.244 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lexer", "Module1\Lexer.csproj", "{9715D879-F06E-4A65-ADA0-A4DF3619119D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleLexer", "Module2\SimpleLangLexer\SimpleLexer.csproj", "{28C0284B-2F43-45D6-A77F-AB08F919717D}" @@ -15,6 +18,9 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecursiveDescentParserDemo", "Module4\SimpleLangParserTest\RecursiveDescentParserDemo.csproj", "{5DD15A1A-760A-4A3F-BA1B-A23ACDF5CC87}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeneratedParser", "Module5\GeneratedParser.csproj", "{0ED50D29-F6C3-44F3-BF13-BC1A433F6119}" + ProjectSection(ProjectDependencies) = postProject + {4DD13462-DCB4-4C3E-B777-7FEA90CEA9D1} = {4DD13462-DCB4-4C3E-B777-7FEA90CEA9D1} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParserAST", "Module6\ParserAST.csproj", "{9815F576-CAB5-4D52-9963-F9B8277E340C}" EndProject @@ -70,20 +76,20 @@ Global {5DD15A1A-760A-4A3F-BA1B-A23ACDF5CC87}.Debug|Any CPU.Build.0 = Debug|Any CPU {5DD15A1A-760A-4A3F-BA1B-A23ACDF5CC87}.Release|Any CPU.ActiveCfg = Release|Any CPU {5DD15A1A-760A-4A3F-BA1B-A23ACDF5CC87}.Release|Any CPU.Build.0 = Release|Any CPU - {0ED50D29-F6C3-44F3-BF13-BC1A433F6119}.Debug|Any CPU.ActiveCfg = Debug|x86 - {0ED50D29-F6C3-44F3-BF13-BC1A433F6119}.Debug|Any CPU.Build.0 = Debug|x86 + {0ED50D29-F6C3-44F3-BF13-BC1A433F6119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0ED50D29-F6C3-44F3-BF13-BC1A433F6119}.Debug|Any CPU.Build.0 = Debug|Any CPU {0ED50D29-F6C3-44F3-BF13-BC1A433F6119}.Release|Any CPU.ActiveCfg = Release|x86 {0ED50D29-F6C3-44F3-BF13-BC1A433F6119}.Release|Any CPU.Build.0 = Release|x86 - {9815F576-CAB5-4D52-9963-F9B8277E340C}.Debug|Any CPU.ActiveCfg = Debug|x86 - {9815F576-CAB5-4D52-9963-F9B8277E340C}.Debug|Any CPU.Build.0 = Debug|x86 + {9815F576-CAB5-4D52-9963-F9B8277E340C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9815F576-CAB5-4D52-9963-F9B8277E340C}.Debug|Any CPU.Build.0 = Debug|Any CPU {9815F576-CAB5-4D52-9963-F9B8277E340C}.Release|Any CPU.ActiveCfg = Release|x86 {9815F576-CAB5-4D52-9963-F9B8277E340C}.Release|Any CPU.Build.0 = Release|x86 - {5F9F534D-DDE0-4B4A-9BC2-2AF8C9ED83FA}.Debug|Any CPU.ActiveCfg = Debug|x86 - {5F9F534D-DDE0-4B4A-9BC2-2AF8C9ED83FA}.Debug|Any CPU.Build.0 = Debug|x86 + {5F9F534D-DDE0-4B4A-9BC2-2AF8C9ED83FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F9F534D-DDE0-4B4A-9BC2-2AF8C9ED83FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F9F534D-DDE0-4B4A-9BC2-2AF8C9ED83FA}.Release|Any CPU.ActiveCfg = Release|x86 {5F9F534D-DDE0-4B4A-9BC2-2AF8C9ED83FA}.Release|Any CPU.Build.0 = Release|x86 - {F8734914-3677-4A80-A87D-C274F52576FD}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F8734914-3677-4A80-A87D-C274F52576FD}.Debug|Any CPU.Build.0 = Debug|x86 + {F8734914-3677-4A80-A87D-C274F52576FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8734914-3677-4A80-A87D-C274F52576FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8734914-3677-4A80-A87D-C274F52576FD}.Release|Any CPU.ActiveCfg = Release|x86 {F8734914-3677-4A80-A87D-C274F52576FD}.Release|Any CPU.Build.0 = Release|x86 {4DD13462-DCB4-4C3E-B777-7FEA90CEA9D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -115,4 +121,10 @@ Global {186EE1C7-7F34-4428-8A82-F63C8D4368E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {186EE1C7-7F34-4428-8A82-F63C8D4368E8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5CD1813A-8F3E-4118-810A-DA7A336FE15D} + EndGlobalSection EndGlobal diff --git a/Module1/App.config b/Module1/App.config index 731f6de..74ade9d 100644 --- a/Module1/App.config +++ b/Module1/App.config @@ -1,6 +1,6 @@ -п»ї<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> </startup> -</configuration> \ No newline at end of file +</configuration> diff --git a/Module1/Lexer.csproj b/Module1/Lexer.csproj index dad95bf..f50a02f 100644 --- a/Module1/Lexer.csproj +++ b/Module1/Lexer.csproj @@ -5,13 +5,14 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{9715D879-F06E-4A65-ADA0-A4DF3619119D}</ProjectGuid> - <OutputType>Exe</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Lexer</RootNamespace> <AssemblyName>Lexer</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -32,6 +33,9 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup> + <StartupObject /> + </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> diff --git a/Module2/SimpleLangLexer/SimpleLexer.csproj b/Module2/SimpleLangLexer/SimpleLexer.csproj index 4849a7d..eb3b9da 100644 --- a/Module2/SimpleLangLexer/SimpleLexer.csproj +++ b/Module2/SimpleLangLexer/SimpleLexer.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLexer</RootNamespace> <AssemblyName>SimpleLexer</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> diff --git a/Module2/SimpleLexerDemo/SimpleLexerDemo.csproj b/Module2/SimpleLexerDemo/SimpleLexerDemo.csproj index 4cfa084..d7a19b6 100644 --- a/Module2/SimpleLexerDemo/SimpleLexerDemo.csproj +++ b/Module2/SimpleLexerDemo/SimpleLexerDemo.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLexerDemo</RootNamespace> <AssemblyName>SimpleLexerDemo</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -52,6 +53,9 @@ <Name>SimpleLexer</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/Module3/GeneratedLexer.csproj b/Module3/GeneratedLexer.csproj index dd458fd..ec72015 100644 --- a/Module3/GeneratedLexer.csproj +++ b/Module3/GeneratedLexer.csproj @@ -17,7 +17,7 @@ </UpgradeBackupLocation> <OldToolsVersion>3.5</OldToolsVersion> <IsWebBootstrapper>true</IsWebBootstrapper> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <PublishUrl>http://localhost/sss/</PublishUrl> <Install>true</Install> <InstallFrom>Web</InstallFrom> @@ -33,6 +33,7 @@ <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> <LangVersion>5</LangVersion> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -90,6 +91,7 @@ </BootstrapperPackage> </ItemGroup> <ItemGroup> + <None Include="app.config" /> <None Include="SimpleLex.lex" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> diff --git a/Module4/SimpleLangParser/RecursiveDescentParser.csproj b/Module4/SimpleLangParser/RecursiveDescentParser.csproj index 92d241e..f7aa8fb 100644 --- a/Module4/SimpleLangParser/RecursiveDescentParser.csproj +++ b/Module4/SimpleLangParser/RecursiveDescentParser.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLangParser</RootNamespace> <AssemblyName>SimpleLangParser</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> diff --git a/Module4/SimpleLangParserTest/RecursiveDescentParserDemo.csproj b/Module4/SimpleLangParserTest/RecursiveDescentParserDemo.csproj index 368bfbb..08fbfe5 100644 --- a/Module4/SimpleLangParserTest/RecursiveDescentParserDemo.csproj +++ b/Module4/SimpleLangParserTest/RecursiveDescentParserDemo.csproj @@ -5,12 +5,13 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{5DD15A1A-760A-4A3F-BA1B-A23ACDF5CC87}</ProjectGuid> - <OutputType>Exe</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLangParserTest</RootNamespace> <AssemblyName>SimpleLangParserTest</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -31,6 +32,9 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup> + <StartupObject /> + </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> @@ -56,6 +60,9 @@ <Name>RecursiveDescentParser</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/Module5/GeneratedParser.csproj b/Module5/GeneratedParser.csproj index b678967..9a10098 100644 --- a/Module5/GeneratedParser.csproj +++ b/Module5/GeneratedParser.csproj @@ -10,8 +10,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLang</RootNamespace> <AssemblyName>SimpleLang</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkProfile> + </TargetFrameworkProfile> <FileAlignment>512</FileAlignment> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> @@ -33,6 +34,24 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> @@ -58,6 +77,9 @@ <Content Include="SimpleLex.lex" /> <Content Include="SimpleYacc.y" /> </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/Module6/ParserAST.csproj b/Module6/ParserAST.csproj index f0ff2f6..d83c581 100644 --- a/Module6/ParserAST.csproj +++ b/Module6/ParserAST.csproj @@ -10,8 +10,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLang</RootNamespace> <AssemblyName>SimpleLang</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkProfile> + </TargetFrameworkProfile> <FileAlignment>512</FileAlignment> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> @@ -33,6 +34,24 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> @@ -58,6 +77,7 @@ <Compile Include="SimpleYacc.cs" /> </ItemGroup> <ItemGroup> + <None Include="app.config" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup> diff --git a/Module6/packages.config b/Module6/packages.config index 7a0d545..5205e21 100644 --- a/Module6/packages.config +++ b/Module6/packages.config @@ -1,4 +1,4 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35-client" /> + <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35-client" requireReinstallation="true" /> </packages> \ No newline at end of file diff --git a/Module7/ParserVistors.csproj b/Module7/ParserVistors.csproj index e63c34a..a9f3853 100644 --- a/Module7/ParserVistors.csproj +++ b/Module7/ParserVistors.csproj @@ -10,8 +10,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLang</RootNamespace> <AssemblyName>SimpleLang</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkProfile> + </TargetFrameworkProfile> <FileAlignment>512</FileAlignment> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> @@ -33,6 +34,24 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> @@ -68,6 +87,9 @@ <Content Include="SimpleLex.lex" /> <Content Include="SimpleYacc.y" /> </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/Module8/ParserGenerator.csproj b/Module8/ParserGenerator.csproj index 946ec9c..f524f13 100644 --- a/Module8/ParserGenerator.csproj +++ b/Module8/ParserGenerator.csproj @@ -10,8 +10,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>SimpleLang</RootNamespace> <AssemblyName>SimpleLang</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkProfile> + </TargetFrameworkProfile> <FileAlignment>512</FileAlignment> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> @@ -33,6 +34,24 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> @@ -65,6 +84,9 @@ <Content Include="SimpleLex.lex" /> <Content Include="SimpleYacc.y" /> </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestASTParser/TestASTParser.csproj b/TestASTParser/TestASTParser.csproj index bf58456..f09ec12 100644 --- a/TestASTParser/TestASTParser.csproj +++ b/TestASTParser/TestASTParser.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestASTParser</RootNamespace> <AssemblyName>TestASTParser</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -37,8 +41,8 @@ <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"> <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath> </Reference> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="System" /> @@ -62,9 +66,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestASTParser/packages.config b/TestASTParser/packages.config index 6386acb..c607c37 100644 --- a/TestASTParser/packages.config +++ b/TestASTParser/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestCodeGenerator/TestCodeGenerator.csproj b/TestCodeGenerator/TestCodeGenerator.csproj index c2110b6..de5b6f0 100644 --- a/TestCodeGenerator/TestCodeGenerator.csproj +++ b/TestCodeGenerator/TestCodeGenerator.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestCodeGenerator</RootNamespace> <AssemblyName>TestCodeGenerator</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -34,9 +38,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -59,9 +62,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestCodeGenerator/packages.config b/TestCodeGenerator/packages.config index 6386acb..c607c37 100644 --- a/TestCodeGenerator/packages.config +++ b/TestCodeGenerator/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestDescentParser/TestDescentParser.csproj b/TestDescentParser/TestDescentParser.csproj index d5a7ba6..40d27d0 100644 --- a/TestDescentParser/TestDescentParser.csproj +++ b/TestDescentParser/TestDescentParser.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestDescentParser</RootNamespace> <AssemblyName>TestDescentParser</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -34,9 +38,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -47,9 +50,6 @@ <Compile Include="Tests.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="..\Module2\SimpleLangLexer\SimpleLexer.csproj"> <Project>{28c0284b-2f43-45d6-a77f-ab08f919717d}</Project> @@ -60,12 +60,16 @@ <Name>RecursiveDescentParser</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestDescentParser/packages.config b/TestDescentParser/packages.config index 6386acb..c607c37 100644 --- a/TestDescentParser/packages.config +++ b/TestDescentParser/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestGeneratedLexer/TestGeneratedLexer.csproj b/TestGeneratedLexer/TestGeneratedLexer.csproj index 5321e94..92cf877 100644 --- a/TestGeneratedLexer/TestGeneratedLexer.csproj +++ b/TestGeneratedLexer/TestGeneratedLexer.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,9 +12,12 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestGeneratedLexer</RootNamespace> <AssemblyName>TestGeneratedLexer</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <LangVersion>6</LangVersion> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -35,9 +39,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -60,9 +63,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestGeneratedLexer/packages.config b/TestGeneratedLexer/packages.config index 6386acb..c607c37 100644 --- a/TestGeneratedLexer/packages.config +++ b/TestGeneratedLexer/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestGeneratedParser/TestGeneratedParser.csproj b/TestGeneratedParser/TestGeneratedParser.csproj index 56b0492..b986dde 100644 --- a/TestGeneratedParser/TestGeneratedParser.csproj +++ b/TestGeneratedParser/TestGeneratedParser.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestGeneratedParser</RootNamespace> <AssemblyName>TestGeneratedParser</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -34,9 +38,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -47,21 +50,22 @@ <Compile Include="Tests.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="..\Module5\GeneratedParser.csproj"> <Project>{0ed50d29-f6c3-44f3-bf13-bc1a433f6119}</Project> <Name>GeneratedParser</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestGeneratedParser/packages.config b/TestGeneratedParser/packages.config index 6386acb..c607c37 100644 --- a/TestGeneratedParser/packages.config +++ b/TestGeneratedParser/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestLexer/TestLexer.csproj b/TestLexer/TestLexer.csproj index 9bfdc49..2b6b78a 100644 --- a/TestLexer/TestLexer.csproj +++ b/TestLexer/TestLexer.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestLexer</RootNamespace> <AssemblyName>TestLexer</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -37,9 +41,8 @@ <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> </Reference> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -62,9 +65,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestLexer/packages.config b/TestLexer/packages.config index 6386acb..c607c37 100644 --- a/TestLexer/packages.config +++ b/TestLexer/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestSimpleLexer/TestSimpleLexer.csproj b/TestSimpleLexer/TestSimpleLexer.csproj index c85ced4..0f61f60 100644 --- a/TestSimpleLexer/TestSimpleLexer.csproj +++ b/TestSimpleLexer/TestSimpleLexer.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestSimpleLexer</RootNamespace> <AssemblyName>TestSimpleLexer</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -37,9 +41,8 @@ <Reference Include="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.CSharp.dll</HintPath> </Reference> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -62,9 +65,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestSimpleLexer/packages.config b/TestSimpleLexer/packages.config index 6386acb..c607c37 100644 --- a/TestSimpleLexer/packages.config +++ b/TestSimpleLexer/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file diff --git a/TestVisitors/TestVisitors.csproj b/TestVisitors/TestVisitors.csproj index 9513e9d..4be5aab 100644 --- a/TestVisitors/TestVisitors.csproj +++ b/TestVisitors/TestVisitors.csproj @@ -1,6 +1,7 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" /> + <Import Project="..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" /> + <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -11,8 +12,11 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TestVisitors</RootNamespace> <AssemblyName>TestVisitors</AssemblyName> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -34,9 +38,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb"> - <HintPath>..\packages\NUnit.3.10.1\lib\net35\nunit.framework.dll</HintPath> - <Private>True</Private> + <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> + <HintPath>..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -47,21 +50,22 @@ <Compile Include="Tests.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="..\Module7\ParserVistors.csproj"> <Project>{5f9f534d-dde0-4b4a-9bc2-2af8c9ed83fa}</Project> <Name>ParserVistors</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> + <ErrorText>Данный проект ссылается РЅР° пакеты NuGet, отсутствующие РЅР° этом компьютере. Рспользуйте восстановление пакетов NuGet, чтобы скачать РёС…. Дополнительную информацию СЃРј. РїРѕ адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" /> + <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.0\build\net35\NUnit3TestAdapter.props'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/TestVisitors/packages.config b/TestVisitors/packages.config index 6386acb..c607c37 100644 --- a/TestVisitors/packages.config +++ b/TestVisitors/packages.config @@ -1,4 +1,6 @@ п»ї<?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NUnit" version="3.10.1" targetFramework="net35" /> + <package id="NUnit" version="3.12.0" targetFramework="net40" /> + <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net40" /> + <package id="NUnit3TestAdapter" version="3.15.0" targetFramework="net40" /> </packages> \ No newline at end of file -- GitLab