Skip to content

Commit 2cac650

Browse files
SteveWilkesSteveWilkes
authored
Releases/3.2 (#68)
* Moving version number to Core project + surfacing in visualizer window title * Updating visualizers version number * Features/net core app visualizer (#66), re: #65 * Adding .NET Core 3.1 test, Visualizers.Core, Visualizers.Console and Visualizers.Vs16 projects / Switching test projects to .NET Core project format / Switching CLS-compliance to opt-in * Adding NetCore visualizer to installer project * Refactoring installer classes / Adding NetCore visualizer assembly * Features/count indents (#67) * Features/font selector (#59) * Start * Continued * Continued * Working font family selector, adding test console app * Adding font size selector * Option to fix dialog size instead of resizing to code (#60) * Start of line counts * Implementing simple GetLineCounts * More GetLineCount()s * More line counts * More line counts * Another line count * Final GetLineCounts + fixing build * Tidying * Translation adjustments * Tidying * Updating package to v2.4.1 * Switching to resize on Resize event only, fixes #64 * v 2.4.1 NuGet package and v3.2 installer and visualizers
1 parent 3c6d16b commit 2cac650

File tree

113 files changed

+2591
-1194
lines changed

Some content is hidden

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

113 files changed

+2591
-1194
lines changed

‎AgileObjects.ReadableExpressions.Visualizers.Vs10.dll

8 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.Vs11.dll

8.5 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.Vs12.dll

8 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.Vs14.dll

8.5 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.Vs15.dll

8.5 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.Vs16.NetCore.dll

193 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.Vs16.dll

8.5 KB
Binary file not shown.

‎AgileObjects.ReadableExpressions.Visualizers.msi

132 KB
Binary file not shown.

‎ClsCompliant.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using System;
2+
3+
[assembly: CLSCompliant(true)]

‎CommonAssemblyInfo.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
using System;
2-
using System.Reflection;
1+
using System.Reflection;
32
using System.Resources;
43

54
[assembly: AssemblyCompany("AgileObjects Ltd")]
65
[assembly: AssemblyProduct("AgileObjects.ReadableExpressions")]
76
[assembly: AssemblyCopyright("Copyright © AgileObjects Ltd 2020")]
8-
[assembly: NeutralResourcesLanguage("en")]
9-
10-
[assembly: CLSCompliant(true)]
7+
[assembly: NeutralResourcesLanguage("en")]

‎NuGet/AgileObjects.ReadableExpressions.2.4.1.nupkg

191 KB
Binary file not shown.

‎ReadableExpressions.UnitTests.Net35/ReadableExpressions.UnitTests.Net35.csproj

Lines changed: 39 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,52 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" />
4-
<Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
5-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
63
<PropertyGroup>
7-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9-
<ProjectGuid>{9EB2525F-48E7-4057-98E5-7FE325ECCD32}</ProjectGuid>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>AgileObjects.ReadableExpressions.UnitTests.Net35</RootNamespace>
4+
<TargetFramework>net35</TargetFramework>
5+
<LangVersion>8.0</LangVersion>
136
<AssemblyName>AgileObjects.ReadableExpressions.UnitTests.Net35</AssemblyName>
14-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
7+
<RootNamespace>AgileObjects.ReadableExpressions.UnitTests</RootNamespace>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<WarningsAsErrors></WarningsAsErrors>
10+
<NoWarn>0649;1701;1702</NoWarn>
2111
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
12+
<IsPackable>false</IsPackable>
13+
<ProjectGuid>{9EB2525F-48E7-4057-98E5-7FE325ECCD32}</ProjectGuid>
2714
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE;NET35</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
15+
16+
<PropertyGroup>
17+
<FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
3518
</PropertyGroup>
19+
20+
<PropertyGroup>
21+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
25+
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
26+
</PropertyGroup>
27+
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
29+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
30+
</PropertyGroup>
31+
3632
<ItemGroup>
37-
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38-
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net35\AgileObjects.NetStandardPolyfills.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
41-
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Dynamic.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Microsoft.Scripting, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
44-
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Microsoft.Scripting.AspNet, Version=1.1.1.21, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
47-
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.AspNet.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Microsoft.Scripting.Core, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
50-
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.Core.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
53-
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.Metadata.dll</HintPath>
54-
</Reference>
55-
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
56-
<HintPath>..\packages\NUnit.3.12.0\lib\net35\nunit.framework.dll</HintPath>
57-
</Reference>
58-
<Reference Include="System" />
59-
<Reference Include="System.Core" />
60-
<Reference Include="System.Xml.Linq" />
61-
<Reference Include="System.Data.DataSetExtensions" />
62-
<Reference Include="System.Data" />
63-
<Reference Include="System.Xml" />
64-
</ItemGroup>
65-
<ItemGroup>
66-
<Compile Include="..\CommonAssemblyInfo.cs">
67-
<Link>Properties\CommonAssemblyInfo.cs</Link>
68-
</Compile>
69-
</ItemGroup>
70-
<ItemGroup>
71-
<Compile Include="..\ReadableExpressions.UnitTests\**\*.cs" Exclude="..\ReadableExpressions.UnitTests\obj\**\*.cs;..\ReadableExpressions.UnitTests\WhenUsingPartialTrust.cs;..\ReadableExpressions.UnitTests\WhenFormattingCodeAsHtml.cs;">
33+
<Compile Include="..\ReadableExpressions.UnitTests\**\*.cs" Exclude="..\ReadableExpressions.UnitTests\obj\**\*.cs;">
7234
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
7335
</Compile>
7436
</ItemGroup>
37+
7538
<ItemGroup>
76-
<None Include="packages.config" />
39+
<Reference Include="System" />
40+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
41+
<PackageReference Include="NUnit" Version="3.12.0" />
42+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
43+
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45+
</PackageReference>
7746
</ItemGroup>
47+
7848
<ItemGroup>
79-
<ProjectReference Include="..\ReadableExpressions\ReadableExpressions.csproj">
80-
<Project>{147ddcce-cdd3-4dd0-8ba3-d3f2f239e161}</Project>
81-
<Name>ReadableExpressions</Name>
82-
</ProjectReference>
49+
<ProjectReference Include="..\ReadableExpressions\ReadableExpressions.csproj" />
8350
</ItemGroup>
84-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
85-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
86-
<PropertyGroup>
87-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
88-
</PropertyGroup>
89-
<Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
90-
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props'))" />
91-
</Target>
92-
</Project>
51+
52+
</Project>

‎ReadableExpressions.UnitTests.Net35/packages.config

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎ReadableExpressions.UnitTests.NetCore3.1/ReadableExpressions.UnitTests.NetCore3.1.csproj

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
6+
<LangVersion>8.0</LangVersion>
7+
<AssemblyName>AgileObjects.ReadableExpressions.UnitTests.NetCore3_1</AssemblyName>
8+
<RootNamespace>AgileObjects.ReadableExpressions.UnitTests</RootNamespace>
9+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<WarningsAsErrors></WarningsAsErrors>
11+
<NoWarn>0649;1701;1702</NoWarn>
12+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
16+
<IsPackable>false</IsPackable>
17+
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_HTML</DefineConstants>
21+
</PropertyGroup>
22+
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
24+
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
25+
</PropertyGroup>
26+
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
28+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
29+
</PropertyGroup>
30+
31+
<ItemGroup>
32+
<Compile Include="..\CommonAssemblyInfo.cs">
33+
<Link>Properties\CommonAssemblyInfo.cs</Link>
34+
</Compile>
35+
<Compile Include="..\ClsCompliant.cs">
36+
<Link>Properties\ClsCompliant.cs</Link>
37+
</Compile>
38+
</ItemGroup>
39+
40+
<ItemGroup>
41+
<Compile Include="..\ReadableExpressions.UnitTests\**\*.cs" Exclude="..\ReadableExpressions.UnitTests\obj\**\*.cs;">
42+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
43+
</Compile>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.1" />
48+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
49+
<PackageReference Include="xunit" Version="2.4.1" />
50+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
51+
<PrivateAssets>all</PrivateAssets>
52+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
53+
</PackageReference>
54+
</ItemGroup>
55+
56+
<ItemGroup>
57+
<ProjectReference Include="..\ReadableExpressions.Visualizers.Core.NetCore\ReadableExpressions.Visualizers.Core.NetCore.csproj" />
58+
<ProjectReference Include="..\ReadableExpressions\ReadableExpressions.csproj" />
59+
</ItemGroup>
60+
61+
</Project>

‎ReadableExpressions.UnitTests/App.config

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎ReadableExpressions.UnitTests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)