Skip to content

Commit ea96574

Browse files
authored
Releases/v next (#146)
* Switching Visualizers to local reference assemblies * Adding visualizer close button, re: #138 * Fixing package references + .NET 3.5 build * Writing translated expressions to temp files * v4.7 Visualizers and installer --------- Co-authored-by: Steve Wilkes <SESA630636@se.com>
1 parent 0ebbbe2 commit ea96574

File tree

70 files changed

+652
-200
lines changed

Some content is hidden

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

70 files changed

+652
-200
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<NeutralResourcesLanguage>en</NeutralResourcesLanguage>
1010
<RepositoryType>git</RepositoryType>
1111
<RepositoryUrl>https://github.com/AgileObjects/ReadableExpressions</RepositoryUrl>
12-
<NoWarn>0649;1701;1702</NoWarn>
12+
<NoWarn>$(NoWarn);CS0649;CS1701;CS1702</NoWarn>
1313
</PropertyGroup>
1414

1515
</Project>

src/ReadableExpressions/ReadableExpressions.csproj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.0' ">1.6.1</NetStandardImplicitPackageVersion>
1515
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
1616

17-
<AssemblyVersion>4.1.3.0</AssemblyVersion>
18-
<FileVersion>4.1.3.0</FileVersion>
19-
<VersionPrefix>4.1.3</VersionPrefix>
20-
<Version>4.1.3</Version>
17+
<AssemblyVersion>4.1.4.0</AssemblyVersion>
18+
<FileVersion>4.1.4.0</FileVersion>
19+
<VersionPrefix>4.1.4</VersionPrefix>
20+
<Version>4.1.4</Version>
2121

2222
<PackageId>AgileObjects.ReadableExpressions</PackageId>
2323
<Title>AgileObjects.ReadableExpressions</Title>
@@ -75,17 +75,14 @@
7575

7676
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
7777
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
78+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
7879
</ItemGroup>
7980

8081
<ItemGroup>
8182
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.6.0" />
8283
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
8384
</ItemGroup>
8485

85-
<PropertyGroup>
86-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
87-
</PropertyGroup>
88-
8986
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(TargetFramework)' == 'net40' ">
9087
<Exec Command="xcopy $(TargetDir)AgileObjects.NetStandardPolyfills.dll &quot;$(SolutionDir)Visualizers\VisualizerAssemblies&quot; /Y&#xD;&#xA;xcopy $(TargetPath) &quot;$(SolutionDir)Visualizers\VisualizerAssemblies&quot; /Y" />
9188
</Target>

src/Tests/ReadableExpressions.UnitTests.Common/ReadableExpressions.UnitTests.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyName>AgileObjects.ReadableExpressions.UnitTests.Common</AssemblyName>
66
<RootNamespace>AgileObjects.ReadableExpressions.UnitTests.Common</RootNamespace>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<WarningsAsErrors></WarningsAsErrors>
8+
<NoWarn>$(NoWarn);NU1903</NoWarn>
99
<AssemblyOriginatorKeyFile>..\..\ReadableExpressions.snk</AssemblyOriginatorKeyFile>
1010
<SignAssembly>true</SignAssembly>
1111
<IsPackable>false</IsPackable>

src/Tests/ReadableExpressions.UnitTests.Net35/ReadableExpressions.UnitTests.Net35.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
<IsTestProject>true</IsTestProject>
1111
</PropertyGroup>
1212

13-
<PropertyGroup>
14-
<FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
15-
</PropertyGroup>
16-
1713
<PropertyGroup>
1814
<DefineConstants>$(DefineConstants);TRACE;FEATURE_PROPERTY_INDEX_DEFAULTS</DefineConstants>
1915
</PropertyGroup>

src/Tests/ReadableExpressions.UnitTests.Net5/ReadableExpressions.UnitTests.Net5.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
39+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
40+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
41+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3942
<PackageReference Include="xunit" Version="2.4.2" />
4043
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
4144
<PrivateAssets>all</PrivateAssets>

src/Tests/ReadableExpressions.UnitTests.Net6/ReadableExpressions.UnitTests.Net6.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
39+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
40+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
41+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3942
<PackageReference Include="xunit" Version="2.4.2" />
4043
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
4144
<PrivateAssets>all</PrivateAssets>

src/Tests/ReadableExpressions.UnitTests.Net7/ReadableExpressions.UnitTests.Net7.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
39+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
40+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
41+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3942
<PackageReference Include="xunit" Version="2.4.2" />
4043
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
4144
<PrivateAssets>all</PrivateAssets>

src/Tests/ReadableExpressions.UnitTests.Net8/ReadableExpressions.UnitTests.Net8.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636

3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
39+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
40+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
41+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3942
<PackageReference Include="xunit" Version="2.4.2" />
4043
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
4144
<PrivateAssets>all</PrivateAssets>

src/Tests/ReadableExpressions.UnitTests.NetCore2/ReadableExpressions.UnitTests.NetCore2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyName>AgileObjects.ReadableExpressions.UnitTests.NetCore2</AssemblyName>
66
<RootNamespace>AgileObjects.ReadableExpressions.UnitTests</RootNamespace>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<WarningsAsErrors></WarningsAsErrors>
8+
<NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1010
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1111
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>

0 commit comments

Comments
 (0)