Skip to content

Commit

Permalink
Eliminated all shared libraries from build, completed transition to Net5
Browse files Browse the repository at this point in the history
  • Loading branch information
hallambaker committed Dec 8, 2020
1 parent 1596a74 commit b5fb559
Show file tree
Hide file tree
Showing 380 changed files with 71,660 additions and 14,659 deletions.
6 changes: 6 additions & 0 deletions ASN/Goedel.Tool.ASN/AssemblyVersion.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.0")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.0")]

6 changes: 0 additions & 6 deletions ASN/Goedel.Tool.ASN/Class1.cs

This file was deleted.

52 changes: 0 additions & 52 deletions ASN/Goedel.Tool.ASN/Design.htm

This file was deleted.

52 changes: 50 additions & 2 deletions ASN/Goedel.Tool.ASN/Goedel.Tool.ASN.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,55 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<OutputType>Library</OutputType>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>Goedel.ASN</RootNamespace>
<Configurations>Debug;Release;Focus</Configurations>
<Company>ThresholdSecrets.Com</Company>
<SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss"))</SourceRevisionId>
<Product>Goedel.Tool.ASN</Product>
<Description>ASN1 schema DSL.</Description>
<Copyright>© 2020</Copyright>
<Title>Goedel.Tool.ASN</Title>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\mmm\Libraries\Core\Goedel.ASN\Goedel.ASN.csproj" />
<ProjectReference Include="..\..\Libraries\Goedel.Tool.Core\Goedel.Tool.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Asn2.cs">
<DependentUpon>Asn2.gdl</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
<Compile Update="GenerateCS.cs">
<DependentUpon>GenerateCS.script</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
</ItemGroup>

<ItemGroup>
<None Update="Asn2.gdl">
<LastGenOutput>Asn2.cs</LastGenOutput>
<Generator>goedel3</Generator>
</None>
<None Update="GenerateCS.script">
<LastGenOutput>GenerateCS.cs</LastGenOutput>
<Generator>GScript</Generator>
</None>
</ItemGroup>

<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="VSPreBuild" />
</Target>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="cd $(ProjectDir) &amp;&amp; VSPostBuildWindows $(TargetDir)" />
</Target>

</Project>
50 changes: 50 additions & 0 deletions ASN/Goedel.Tool.ASN/VS.Make
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

# Supplemental Makefile for Visual Studios Projects
#
# Visual Studio runs tools for most projects but not for shared projects.
#
# Prebuild items supported:
# [None currently]
#
# PostBuild items supported:
# * Copy library to locations on disk
# * Build ilMerge executables
# * Postprocess VSIX projects
# * Copy executables


.PHONY : all always clean install publish prebuild prebuildRecurse postbuild postbuildRecurse

MSBuildThisFileDirectory =

LinkFiles = \
Goedel.ASN.dll\
Goedel.Tool.Core.dll

ToolTargets = \
Asn2.cs\
GenerateCS.cs
Asn2.cs : Asn2.gdl
goedel3 Asn2.gdl /cs Asn2.cs

GenerateCS.cs : GenerateCS.script
gscript GenerateCS.script GenerateCS.cs



prebuildRecurse :


postbuildRecurse :

# Non shared project, nothing to do
prebuild : prebuildRecurse $(ToolTargets)
version version.version AssemblyVersion.cs


postbuild : postbuildRecurse


postbuildwindows :
powershell publishtarget Goedel.Tool.ASN.dll

4 changes: 2 additions & 2 deletions ASN/asn2/AssemblyVersion.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Reflection;

[assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.360")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.360")]
[assembly: System.Reflection.AssemblyVersionAttribute("3.0.0.361")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.0.0.361")]

5 changes: 2 additions & 3 deletions ASN/asn2/VS.Make
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ MSBuildThisFileDirectory =

LinkFiles = \
Goedel.ASN.dll\
Goedel.Tool.Core.dll
Goedel.Tool.Core.dll\
Goedel.Tool.ASN.dll

ToolTargets = \
ASN2.cs
Expand All @@ -29,11 +30,9 @@ ASN2.cs : ASN2.command


prebuildRecurse :
cd ..\Goedel.Tool.ASN && nmake /c /f VS.make prebuild


postbuildRecurse :
cd ..\Goedel.Tool.ASN && nmake /c /f VS.make postbuild

# Non shared project, nothing to do
prebuild : prebuildRecurse $(ToolTargets)
Expand Down
2 changes: 1 addition & 1 deletion ASN/asn2/asn2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

<ItemGroup>
<ProjectReference Include="..\..\..\mmm\Libraries\Core\Goedel.ASN\Goedel.ASN.csproj" />
<ProjectReference Include="..\..\Goedel.Tool.ASN\Goedel.Tool.ASN.csproj" />
<ProjectReference Include="..\..\Libraries\Goedel.Tool.Core\Goedel.Tool.Core.csproj" />
<ProjectReference Include="..\Goedel.Tool.ASN\Goedel.Tool.ASN.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ASN/asn2/version.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
3.0.0.360
3.0.0.360
3.0.0.361
3.0.0.361
Loading

0 comments on commit b5fb559

Please sign in to comment.