Skip to content

Commit 085aa98

Browse files
author
Sébastien Geiser
committed
Redo tryWindow for VS2019
And ->LicenceURL -> PackageLicenseFile
1 parent 692e4e2 commit 085aa98

File tree

10 files changed

+223
-66
lines changed

10 files changed

+223
-66
lines changed

‎CodingSeb.ExpressionEvaluator.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27428.2043
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28729.10
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingSeb.ExpressionEvaluator", "CodingSeb.ExpressionEvaluator\CodingSeb.ExpressionEvaluator.csproj", "{21F19149-EED6-4856-AB9A-701C41F86F66}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingSeb.ExpressionEvaluator", "CodingSeb.ExpressionEvaluator\CodingSeb.ExpressionEvaluator.csproj", "{21F19149-EED6-4856-AB9A-701C41F86F66}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingSeb.ExpressionEvaluator.Tests", "CodingSeb.ExpressionEvaluator.Tests\CodingSeb.ExpressionEvaluator.Tests.csproj", "{8794CB3B-EAB2-411D-B912-7AD3425D6C62}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingSeb.ExpressionEvaluator.Tests", "CodingSeb.ExpressionEvaluator.Tests\CodingSeb.ExpressionEvaluator.Tests.csproj", "{8794CB3B-EAB2-411D-B912-7AD3425D6C62}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TryWindow", "TryWindow\TryWindow.csproj", "{22B6187F-8C49-4A3E-9439-2C287ED7710C}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TryWindow", "TryWindow\TryWindow.csproj", "{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +23,10 @@ Global
2323
{8794CB3B-EAB2-411D-B912-7AD3425D6C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
2424
{8794CB3B-EAB2-411D-B912-7AD3425D6C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
2525
{8794CB3B-EAB2-411D-B912-7AD3425D6C62}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{22B6187F-8C49-4A3E-9439-2C287ED7710C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{22B6187F-8C49-4A3E-9439-2C287ED7710C}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{22B6187F-8C49-4A3E-9439-2C287ED7710C}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{22B6187F-8C49-4A3E-9439-2C287ED7710C}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Release|Any CPU.Build.0 = Release|Any CPU
3030
EndGlobalSection
3131
GlobalSection(SolutionProperties) = preSolution
3232
HideSolutionNode = FALSE

‎CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<OutputPath>bin\$(Configuration)\</OutputPath>
1212
<Authors>Coding Seb</Authors>
1313
<PackageId>CodingSeb.ExpressionEvaluator</PackageId>
14-
<PackageLicenseUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/LICENSE.md</PackageLicenseUrl>
14+
<PackageLicenseUrl></PackageLicenseUrl>
1515
<PackageProjectUrl>https://github.com/codingseb/ExpressionEvaluator</PackageProjectUrl>
1616
<PackageTags>evaluation math expression-evaluator expression parser eval evaluate fluid C# calculation execute script</PackageTags>
1717
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
@@ -20,6 +20,7 @@
2020
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2121
<PackageReleaseNotes>* Change Variables In IDictionary&lt;string,object&gt;
2222
* Correction of a conflict when variable assignation vs on the fly in object with the same name</PackageReleaseNotes>
23+
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2526
<DebugType>full</DebugType>
@@ -34,4 +35,10 @@
3435
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
3536
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
3637
</ItemGroup>
38+
<ItemGroup>
39+
<None Include="..\LICENSE.md">
40+
<Pack>True</Pack>
41+
<PackagePath></PackagePath>
42+
</None>
43+
</ItemGroup>
3744
</Project>

‎TryWindow/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
55
</startup>
6-
</configuration>
6+
</configuration>

‎TryWindow/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
HorizontalScrollBarVisibility="Auto"
4141
VerticalScrollBarVisibility="Auto"/>
4242
</Border>
43-
43+
4444
</DockPanel>
4545
</Window>
46+

‎TryWindow/MainWindow.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
4444
evaluator.EvaluateVariable += Evaluator_EvaluateVariable;
4545

4646
Stopwatch stopWatch = new Stopwatch();
47-
47+
4848

4949
try
5050
{
@@ -53,7 +53,7 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
5353
Exception exception = null;
5454
cancellationTokenSource = new CancellationTokenSource();
5555
cancellationTokenSource.Token.ThrowIfCancellationRequested();
56-
string result = await Task.Run<string>(() =>
56+
string result = await Task.Run<string>(() =>
5757
{
5858
if (!int.TryParse(sIteration, out int iterations))
5959
iterations = 1;
@@ -67,13 +67,13 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
6767
{
6868
string innerResult = "null or void";
6969

70-
for(int i = 0; i < iterations; i++)
70+
for (int i = 0; i < iterations; i++)
7171
innerResult = evaluator.ScriptEvaluate(script)?.ToString() ?? "null or void";
7272

7373
return innerResult;
7474
}
7575
}
76-
catch(Exception innerException)
76+
catch (Exception innerException)
7777
{
7878
exception = innerException;
7979
return null;
@@ -89,7 +89,7 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
8989
else
9090
throw exception;
9191
}
92-
catch(Exception exception)
92+
catch (Exception exception)
9393
{
9494
ResultTextBlock.Text = exception.Message;
9595
}

‎TryWindow/Properties/AssemblyInfo.cs

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
using System.Reflection;
2+
using System.Resources;
3+
using System.Runtime.CompilerServices;
4+
using System.Runtime.InteropServices;
5+
using System.Windows;
6+
7+
// Les informations générales relatives à un assembly dépendent de
8+
// l'ensemble d'attributs suivant. Pour modifier les informations
9+
// associées à un assembly.
10+
[assembly: AssemblyTitle("TryWindow")]
11+
[assembly: AssemblyDescription("Coding Seb")]
12+
[assembly: AssemblyConfiguration("")]
13+
[assembly: AssemblyCompany("")]
14+
[assembly: AssemblyProduct("TryWindow")]
15+
[assembly: AssemblyCopyright("Copyright © Coding Seb 2018")]
16+
[assembly: AssemblyTrademark("")]
17+
[assembly: AssemblyCulture("")]
18+
19+
// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly
20+
// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de
21+
// COM, affectez la valeur True à l'attribut ComVisible sur ce type.
22+
[assembly: ComVisible(false)]
23+
24+
//Pour commencer à générer des applications localisables, définissez
25+
//<UICulture>CultureUtiliséePourCoder</UICulture> dans votre fichier .csproj
26+
//dans <PropertyGroup>. Par exemple, si vous utilisez le français
27+
//dans vos fichiers sources, définissez <UICulture> à fr-FR. Puis, supprimez les marques de commentaire de
28+
//l'attribut NeutralResourceLanguage ci-dessous. Mettez à jour "fr-FR" dans
29+
//la ligne ci-après pour qu'elle corresponde au paramètre UICulture du fichier projet.
30+
31+
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
32+
33+
34+
[assembly: ThemeInfo(
35+
ResourceDictionaryLocation.None, //où se trouvent les dictionnaires de ressources spécifiques à un thème
36+
//(utilisé si une ressource est introuvable dans la page,
37+
// ou dictionnaires de ressources de l'application)
38+
ResourceDictionaryLocation.SourceAssembly //où se trouve le dictionnaire de ressources générique
39+
//(utilisé si une ressource est introuvable dans la page,
40+
// dans l'application ou dans l'un des dictionnaires de ressources spécifiques à un thème)
41+
)]
42+
43+
44+
// Les informations de version pour un assembly se composent des quatre valeurs suivantes :
45+
//
46+
// Version principale
47+
// Version secondaire
48+
// Numéro de build
49+
// Révision
50+
//
51+
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
52+
// en utilisant '*', comme indiqué ci-dessous :
53+
// [assembly: AssemblyVersion("1.0.*")]
54+
[assembly: AssemblyVersion("1.0.0.0")]
55+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎TryWindow/Properties/Resources.Designer.cs

Lines changed: 26 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TryWindow/Properties/Settings.Designer.cs

Lines changed: 17 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)