Skip to content

Commit b8330ef

Browse files
rivantsovrivantsov
authored
Merge pull request #51 from IronyProject/roman_dev
Prepared new package versions 1.2
2 parents f7a9c46 + df6e010 commit b8330ef

19 files changed

+44
-256
lines changed

‎Irony.GrammarExplorer/030.Irony.GrammarExplorer.csproj

Lines changed: 22 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,22 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{AE1C04A8-B03D-4144-98E9-BF66C50265E7}</ProjectGuid>
9-
<OutputType>WinExe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Irony.GrammarExplorer</RootNamespace>
12-
<AssemblyName>Irony.GrammarExplorer</AssemblyName>
13-
<FileUpgradeFlags>
14-
</FileUpgradeFlags>
15-
<OldToolsVersion>3.5</OldToolsVersion>
16-
<UpgradeBackupLocation>
17-
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
19-
<SccProjectName>
20-
</SccProjectName>
21-
<SccLocalPath>
22-
</SccLocalPath>
23-
<SccAuxPath>
24-
</SccAuxPath>
25-
<SccProvider>
26-
</SccProvider>
27-
<PublishUrl>publish\</PublishUrl>
28-
<Install>true</Install>
29-
<InstallFrom>Disk</InstallFrom>
30-
<UpdateEnabled>false</UpdateEnabled>
31-
<UpdateMode>Foreground</UpdateMode>
32-
<UpdateInterval>7</UpdateInterval>
33-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
34-
<UpdatePeriodically>false</UpdatePeriodically>
35-
<UpdateRequired>false</UpdateRequired>
36-
<MapFileExtensions>true</MapFileExtensions>
37-
<ApplicationRevision>0</ApplicationRevision>
38-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
39-
<IsWebBootstrapper>false</IsWebBootstrapper>
40-
<UseApplicationTrust>false</UseApplicationTrust>
41-
<BootstrapperEnabled>true</BootstrapperEnabled>
42-
<TargetFrameworkProfile>
43-
</TargetFrameworkProfile>
44-
</PropertyGroup>
45-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
46-
<DebugSymbols>true</DebugSymbols>
47-
<DebugType>full</DebugType>
48-
<Optimize>false</Optimize>
49-
<OutputPath>bin\Debug\</OutputPath>
50-
<DefineConstants>DEBUG;TRACE</DefineConstants>
51-
<ErrorReport>prompt</ErrorReport>
52-
<WarningLevel>4</WarningLevel>
53-
<Prefer32Bit>false</Prefer32Bit>
54-
</PropertyGroup>
55-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
56-
<DebugType>pdbonly</DebugType>
57-
<Optimize>true</Optimize>
58-
<OutputPath>bin\Release\</OutputPath>
59-
<DefineConstants>TRACE</DefineConstants>
60-
<ErrorReport>prompt</ErrorReport>
61-
<WarningLevel>4</WarningLevel>
62-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
63-
<Prefer32Bit>false</Prefer32Bit>
64-
</PropertyGroup>
65-
<ItemGroup>
66-
<Reference Include="System" />
67-
<Reference Include="System.Core">
68-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
69-
</Reference>
70-
<Reference Include="System.Data" />
71-
<Reference Include="System.Deployment" />
72-
<Reference Include="System.Drawing" />
73-
<Reference Include="System.Windows.Forms" />
74-
<Reference Include="System.Xml" />
75-
</ItemGroup>
76-
<ItemGroup>
77-
<Compile Include="fmGrammarExplorer.cs">
78-
<SubType>Form</SubType>
79-
</Compile>
80-
<Compile Include="fmGrammarExplorer.Designer.cs">
81-
<DependentUpon>fmGrammarExplorer.cs</DependentUpon>
82-
</Compile>
83-
<Compile Include="fmSelectGrammars.cs">
84-
<SubType>Form</SubType>
85-
</Compile>
86-
<Compile Include="fmSelectGrammars.Designer.cs">
87-
<DependentUpon>fmSelectGrammars.cs</DependentUpon>
88-
</Compile>
89-
<Compile Include="GrammarItemList.cs" />
90-
<Compile Include="GrammarLoader.cs" />
91-
<Compile Include="Program.cs" />
92-
<Compile Include="Properties\AssemblyInfo.cs" />
93-
<EmbeddedResource Include="fmGrammarExplorer.resx">
94-
<DependentUpon>fmGrammarExplorer.cs</DependentUpon>
95-
<SubType>Designer</SubType>
96-
</EmbeddedResource>
97-
<EmbeddedResource Include="fmSelectGrammars.resx">
98-
<DependentUpon>fmSelectGrammars.cs</DependentUpon>
99-
</EmbeddedResource>
100-
<EmbeddedResource Include="Properties\Resources.resx">
101-
<Generator>ResXFileCodeGenerator</Generator>
102-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
103-
<SubType>Designer</SubType>
104-
</EmbeddedResource>
105-
<Compile Include="Properties\Resources.Designer.cs">
106-
<AutoGen>True</AutoGen>
107-
<DependentUpon>Resources.resx</DependentUpon>
108-
<DesignTime>True</DesignTime>
109-
</Compile>
110-
<None Include="app.config" />
111-
<None Include="Properties\Settings.settings">
112-
<Generator>SettingsSingleFileGenerator</Generator>
113-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
114-
</None>
115-
<Compile Include="Properties\Settings.Designer.cs">
116-
<AutoGen>True</AutoGen>
117-
<DependentUpon>Settings.settings</DependentUpon>
118-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
119-
</Compile>
120-
</ItemGroup>
121-
<ItemGroup>
122-
<ProjectReference Include="..\Irony.Interpreter\015.Irony.Interpreter.csproj">
123-
<Project>{321A7F5D-00C2-4095-9970-075CDEE8C139}</Project>
124-
<Name>015.Irony.Interpreter</Name>
125-
</ProjectReference>
126-
<ProjectReference Include="..\Irony.WinForms\035.Irony.WinForms.csproj">
127-
<Project>{70D319F3-3C0C-4EB5-A271-58ED22FB3070}</Project>
128-
<Name>035.Irony.WinForms</Name>
129-
</ProjectReference>
130-
<ProjectReference Include="..\Irony\010.Irony.csproj">
131-
<Project>{D81F5C91-D7DB-46E5-BC99-49488FB6814C}</Project>
132-
<Name>010.Irony</Name>
133-
</ProjectReference>
134-
</ItemGroup>
135-
<ItemGroup>
136-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
137-
<Visible>False</Visible>
138-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
139-
<Install>false</Install>
140-
</BootstrapperPackage>
141-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
142-
<Visible>False</Visible>
143-
<ProductName>.NET Framework 3.5 SP1</ProductName>
144-
<Install>true</Install>
145-
</BootstrapperPackage>
146-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
147-
<Visible>False</Visible>
148-
<ProductName>Windows Installer 3.1</ProductName>
149-
<Install>true</Install>
150-
</BootstrapperPackage>
151-
</ItemGroup>
152-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
153-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
154-
Other similar extension points exist, see Microsoft.Common.targets.
155-
<Target Name="BeforeBuild">
156-
</Target>
157-
<Target Name="AfterBuild">
158-
</Target>
159-
-->
160-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net472</TargetFramework>
6+
<RootNamespace>Irony.GrammarExplorer</RootNamespace>
7+
<AssemblyName>Irony.GrammarExplorer</AssemblyName>
8+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<ProjectReference Include="..\Irony.WinForms\035.Irony.WinForms.csproj" />
13+
<ProjectReference Include="..\Irony\010.Irony.csproj" />
14+
<ProjectReference Include="..\Irony.Interpreter\015.Irony.Interpreter.csproj" />
15+
<ProjectReference Include="..\Irony.Samples\020.Irony.Samples.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Reference Include="System.Windows.Forms" />
20+
</ItemGroup>
21+
22+
</Project>

‎Irony.GrammarExplorer/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ static void Main() {
2828
}
2929

3030
static Program CreateInstanceInSeparateDomain() {
31-
var setup = new AppDomainSetup {
31+
var setup = new AppDomainSetup()
32+
{
3233
ShadowCopyFiles = true.ToString()
3334
};
3435

‎Irony.GrammarExplorer/Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Irony.GrammarExplorer/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Irony.GrammarExplorer/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
</setting>
3131
</Irony.GrammarExplorer.Properties.Settings>
3232
</userSettings>
33-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
33+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎Irony.Interpreter/015.Irony.Interpreter.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<RootNamespace>Irony.Interpreter</RootNamespace>
66
<AssemblyName>Irony.Interpreter</AssemblyName>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>irony.snk</AssemblyOriginatorKeyFile>
10+
<AssemblyVersion>1.2.0</AssemblyVersion>
11+
<Version>1.2.0</Version>
1012
</PropertyGroup>
1113

1214
<ItemGroup>

‎Irony.Samples.Console/025.Irony.Samples.Console.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>net472</TargetFramework>
55
<RootNamespace>Irony.Samples.Console</RootNamespace>
66
<AssemblyName>Irony.Samples.Console</AssemblyName>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎Irony.Tests/040.Irony.Tests.VsTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Irony.Tests</RootNamespace>
1212
<AssemblyName>Irony.Tests.VSTest</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1616
<SccProjectName>

‎Irony.Tests/050.Irony.Tests.NUnit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>Irony.Tests</RootNamespace>
1313
<AssemblyName>Irony.Tests.NUnit</AssemblyName>
14-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<SccProjectName>
1717
</SccProjectName>
@@ -50,7 +50,7 @@
5050
<DebugType>full</DebugType>
5151
<Optimize>false</Optimize>
5252
<OutputPath>bin\Debug\</OutputPath>
53-
<DefineConstants>TRACE;DEBUG;USE_NUNIT</DefineConstants>
53+
<DefineConstants>TRACE;USE_NUNIT</DefineConstants>
5454
<ErrorReport>prompt</ErrorReport>
5555
<WarningLevel>4</WarningLevel>
5656
<Prefer32Bit>false</Prefer32Bit>

‎Irony.WinForms/035.Irony.WinForms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Irony.WinForms</RootNamespace>
1212
<AssemblyName>Irony.WinForms</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile>
1616
</TargetFrameworkProfile>

‎Irony.WinForms/Properties/AssemblyInfo.cs

-4 Bytes
Binary file not shown.

‎Irony/010.Irony.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<RootNamespace>Irony</RootNamespace>
66
<AssemblyName>Irony</AssemblyName>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>irony.snk</AssemblyOriginatorKeyFile>
10+
<AssemblyVersion>1.2.0</AssemblyVersion>
11+
<Version>1.2.0</Version>
1012

11-
<!--
13+
<!--
1214
This assembly is marked SecurityTransparent, which requires verifiable IL.
1315
Setting peverify-compat ensures that the C# compiler will forgoe optimizations that would produce unverifiable IL.
1416
-->

‎Irony/Irony.nuspec

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<tags> irony ast grammar bnf </tags>
1414
<dependencies>
15-
<group targetFramework=".NETFramework4.0" />
16-
<group targetFramework=".NETFramework4.5" />
1715
<group targetFramework=".NETStandard2.0">
18-
<dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
1916
</group>
2017
</dependencies>
2118
</metadata>
2219
<files>
23-
<file src="bin\Release\net40\Irony.dll" target="lib\net40\Irony.dll" />
24-
<file src="bin\Release\net45\Irony.dll" target="lib\net45\Irony.dll" />
2520
<file src="bin\Release\netstandard2.0\Irony.dll" target="lib\netstandard2.0\Irony.dll" />
26-
<file src="bin\Release\sl5\Irony.dll" target="lib\sl5\Irony.dll" />
2721
</files>
2822
</package>

‎Languages/Refal.UnitTests/Refal.UnitTests.VsTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>Refal.UnitTests</RootNamespace>
1313
<AssemblyName>Refal.UnitTests.VsTest</AssemblyName>
14-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<TargetFrameworkProfile />

‎Nuget/PackAll.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET pver=1.1.0
1+
SET pver=1.2.0
22
Echo Version: "%pver%"
33
del /q Nupkg\*.*
44
:: Need to delete some MSBuild-generated temp files (with .cs extension)

‎Nuget/PackageSpecs/Irony.Interpreter.nuspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
</metadata>
1919

2020
<files>
21-
<file src="..\..\Irony.Interpreter\bin\Release\net40\Irony.Interpreter.dll" target="lib\net40" />
22-
<file src="..\..\Irony.Interpreter\bin\Release\net40\Irony.Interpreter.pdb" target="lib\net40" />
2321
<file src="..\..\Irony.Interpreter\bin\Release\netstandard2.0\Irony.Interpreter.dll" target="lib\netstandard2.0" />
2422
<file src="..\..\Irony.Interpreter\bin\Release\netstandard2.0\Irony.Interpreter.pdb" target="lib\netstandard2.0" />
2523
</files>

‎Nuget/PackageSpecs/Irony.nuspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
</metadata>
1818

1919
<files>
20-
<file src="..\..\Irony\bin\Release\net40\Irony.dll" target="lib\net40" />
21-
<file src="..\..\Irony\bin\Release\net40\Irony.pdb" target="lib\net40" />
2220
<file src="..\..\Irony\bin\Release\netstandard2.0\Irony.dll" target="lib\netstandard2.0" />
2321
<file src="..\..\Irony\bin\Release\netstandard2.0\Irony.pdb" target="lib\netstandard2.0" />
2422
</files>

‎Nuget/PushAll.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET pver=1.1.0
1+
SET pver=1.2.0
22
Echo Version: "%pver%"
33
dir Nupkg\*.nupkg
44
@echo off

0 commit comments

Comments
 (0)