Skip to content

Commit 14ffef6

Browse files
codingsebcodingseb
authored
Merge pull request #10 from codingseb/dev
Dev For version 1.2.0
2 parents 6691da5 + 5604054 commit 14ffef6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4208
-246
lines changed

‎CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

Lines changed: 65 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
43
<Import Project="..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" />
54
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
65
<PropertyGroup>
@@ -13,14 +12,6 @@
1312
<AssemblyName>CodingSeb.ExpressionEvaluator.Tests</AssemblyName>
1413
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1514
<FileAlignment>512</FileAlignment>
16-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
18-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
19-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
20-
<IsCodedUITest>False</IsCodedUITest>
21-
<TestProjectType>UnitTest</TestProjectType>
22-
<NuGetPackageImportStamp>
23-
</NuGetPackageImportStamp>
2415
</PropertyGroup>
2516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2617
<DebugSymbols>true</DebugSymbols>
@@ -40,11 +31,8 @@
4031
<WarningLevel>4</WarningLevel>
4132
</PropertyGroup>
4233
<ItemGroup>
43-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
47-
<HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
34+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
35+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4836
</Reference>
4937
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
5038
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
@@ -56,8 +44,14 @@
5644
<Reference Include="System.Core" />
5745
</ItemGroup>
5846
<ItemGroup>
47+
<Compile Include="ExpressionEvaluatorScriptEvaluateTests.cs" />
5948
<Compile Include="ExpressionEvaluatorTests.cs" />
6049
<Compile Include="Properties\AssemblyInfo.cs" />
50+
<Compile Include="Resources.Designer.cs">
51+
<AutoGen>True</AutoGen>
52+
<DesignTime>True</DesignTime>
53+
<DependentUpon>Resources.resx</DependentUpon>
54+
</Compile>
6155
<Compile Include="TestsUtils\ClassForTest1.cs" />
6256
<Compile Include="TestsUtils\ClassForTest2.cs" />
6357
<Compile Include="TestsUtils\ClassInOtherNameSpace1.cs" />
@@ -71,16 +65,69 @@
7165
<Name>CodingSeb.ExpressionEvaluator</Name>
7266
</ProjectReference>
7367
</ItemGroup>
74-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
68+
<ItemGroup>
69+
<EmbeddedResource Include="Resources.resx">
70+
<Generator>ResXFileCodeGenerator</Generator>
71+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
72+
</EmbeddedResource>
73+
</ItemGroup>
74+
<ItemGroup>
75+
<None Include="Resources\Script0001.txt" />
76+
</ItemGroup>
77+
<ItemGroup>
78+
<None Include="Resources\Script0002.txt" />
79+
</ItemGroup>
80+
<ItemGroup>
81+
<None Include="Resources\Script0003.txt" />
82+
</ItemGroup>
83+
<ItemGroup>
84+
<None Include="Resources\Script0004.txt" />
85+
</ItemGroup>
86+
<ItemGroup>
87+
<None Include="Resources\Script0005.txt" />
88+
</ItemGroup>
89+
<ItemGroup>
90+
<None Include="Resources\Script0006.txt" />
91+
</ItemGroup>
92+
<ItemGroup>
93+
<None Include="Resources\Script0007.txt" />
94+
</ItemGroup>
95+
<ItemGroup>
96+
<None Include="Resources\Script0008.txt" />
97+
</ItemGroup>
98+
<ItemGroup>
99+
<None Include="Resources\Script0009.txt" />
100+
</ItemGroup>
101+
<ItemGroup>
102+
<None Include="Resources\Script0010.txt" />
103+
</ItemGroup>
104+
<ItemGroup>
105+
<None Include="Resources\Script0011.txt" />
106+
</ItemGroup>
107+
<ItemGroup>
108+
<None Include="Resources\Script0012.txt" />
109+
</ItemGroup>
110+
<ItemGroup>
111+
<None Include="Resources\Script0013.txt" />
112+
</ItemGroup>
113+
<ItemGroup>
114+
<None Include="Resources\Script0014.txt" />
115+
</ItemGroup>
116+
<ItemGroup>
117+
<None Include="Resources\Script0015.txt" />
118+
</ItemGroup>
119+
<ItemGroup>
120+
<None Include="Resources\Script0016.txt" />
121+
</ItemGroup>
122+
<ItemGroup>
123+
<None Include="Resources\Script0017.txt" />
124+
</ItemGroup>
75125
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76126
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
77127
<PropertyGroup>
78128
<ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
79129
</PropertyGroup>
80130
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
81131
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props'))" />
82-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props'))" />
83-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets'))" />
84132
</Target>
85-
<Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
86133
</Project>

0 commit comments

Comments
 (0)