Merge pull request #3 from tfabraham/v2.3

Retarget to .NET Framework v4.5 and bump version
tfabraham · Jul 10, 2020 · 2f7245f · 2f7245f
2 parents fd7b9fd + 1e77a1d
commit 2f7245f
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -289,3 +289,4 @@ __pycache__/
 
 # BizTalk Typed BAM API Generator
 Staging/
+Temp/
diff --git a/BizTalkTypedBAMAPIGenerator.targets b/BizTalkTypedBAMAPIGenerator.targets
@@ -7,7 +7,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build;PackageMain">
  <PropertyGroup>
- <Version>2_2</Version>
+ <Version>2_3</Version>
  </PropertyGroup>
 
  <ItemGroup>
@@ -20,12 +20,12 @@
  </ItemGroup>
 
  <ItemGroup>
- <Stage Include="..\temp\License.txt" />
- <Stage Include="..\temp\GenerateTypedBamApiGuide.pdf" />
- <Stage Include="..\temp\x86\ExportBamDefinitionXml.exe" />
- <Stage Include="..\temp\x86\GenerateTypedBamApi.exe" />
- <Stage Include="..\temp\x64\ExportBamDefinitionXml.exe" />
- <Stage Include="..\temp\x64\GenerateTypedBamApi.exe" />
+ <Stage Include=".\temp\License.txt" />
+ <Stage Include=".\temp\GenerateTypedBamApiGuide.pdf" />
+ <Stage Include=".\temp\x86\ExportBamDefinitionXml.exe" />
+ <Stage Include=".\temp\x86\GenerateTypedBamApi.exe" />
+ <Stage Include=".\temp\x64\ExportBamDefinitionXml.exe" />
+ <Stage Include=".\temp\x64\GenerateTypedBamApi.exe" />
  </ItemGroup>
 
  <Target Name="Build">
@@ -37,8 +37,8 @@
 
  <Target Name="PackageMain">
  <Delete Files="Staging\BizTalkTypedBAMAPIGeneratorV$(Version).zip" />
- <RemoveDir Directories="..\temp" />
+ <RemoveDir Directories=".\temp" />
  <Copy SourceFiles="@(Main)" DestinationFiles="@(Stage)" />
- <Exec Command="tools\7za a -r -tzip Staging\BizTalkTypedBAMAPIGeneratorV$(Version).zip ..\temp\*" />
+ <Exec Command="tools\7za a -r -tzip Staging\BizTalkTypedBAMAPIGeneratorV$(Version).zip .\temp\*" />
  </Target>
 </Project>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Version 2.3 (7/9/2020)
+
+Changes in this release:
+
+* CHANGE: Require .NET Framework 4.5 or newer
+* CHANGE: Minor doc updates
+
 ## Version 2.2 (11/17/2011)
 
 Changes in this release:

diff --git a/docs/GenerateTypedBamApiGuide.docx b/docs/GenerateTypedBamApiGuide.docx
diff --git a/docs/GenerateTypedBamApiGuide.pdf b/docs/GenerateTypedBamApiGuide.pdf
diff --git a/src/ExportBAMDefinitionXML/ExportBamDefinitionXml.csproj b/src/ExportBAMDefinitionXML/ExportBamDefinitionXml.csproj
@@ -8,64 +8,48 @@
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
  <AssemblyName>ExportBamDefinitionXml</AssemblyName>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
  <DelaySign>false</DelaySign>
  <OutputType>Exe</OutputType>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
  <RootNamespace>ExportBamDefinitionXml</RootNamespace>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
  <DebugSymbols>true</DebugSymbols>
  <OutputPath>bin\x86\Debug\</OutputPath>
  <DefineConstants>DEBUG;TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <DebugType>full</DebugType>
  <PlatformTarget>x86</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
  <OutputPath>bin\x86\Release\</OutputPath>
  <DefineConstants>TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <Optimize>true</Optimize>
  <PlatformTarget>x86</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
  <DebugSymbols>true</DebugSymbols>
  <OutputPath>bin\x64\Debug\</OutputPath>
  <DefineConstants>DEBUG;TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <DebugType>full</DebugType>
  <PlatformTarget>x64</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
  <OutputPath>bin\x64\Release\</OutputPath>
  <DefineConstants>TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <Optimize>true</Optimize>
  <PlatformTarget>x64</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
  <Reference Include="System">
@@ -87,6 +71,9 @@
  <SubType>Code</SubType>
  </Compile>
  </ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
  <PreBuildEvent>

diff --git a/src/ExportBAMDefinitionXML/Program.cs b/src/ExportBAMDefinitionXML/Program.cs
@@ -66,8 +66,8 @@ private static void PrintHeader()
  Console.WriteLine(
  "BizTalk BAM Definition XML Exporter "
  + assemblyVersion.Major + "." + assemblyVersion.Minor + "." + assemblyVersion.Build);
- Console.WriteLine("[http://GenerateTypedBamApi.codeplex.com/]");
- Console.WriteLine("Copyright (C) 2007-08 Darren Jefford and 2008-10 Thomas F. Abraham");
+ Console.WriteLine("[https://github.com/tfabraham/BizTalkTypedBAMAPIGenerator]");
+ Console.WriteLine("Copyright (C) 2007 Darren Jefford and 2008 Thomas F. Abraham");
  Console.WriteLine();
 
  Console.ResetColor();

diff --git a/src/ExportBAMDefinitionXML/Properties/AssemblyInfo.cs b/src/ExportBAMDefinitionXML/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GenerateTypedBamApi")]
-[assembly: AssemblyCopyright("Copyright (C) Thomas F. Abraham 2008-17")]
+[assembly: AssemblyCopyright("Copyright (C) Thomas F. Abraham 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -35,5 +35,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
diff --git a/src/ExportBAMDefinitionXML/app.config b/src/ExportBAMDefinitionXML/app.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ </startup>
+</configuration>
diff --git a/src/GenerateTypedBamApi/GenerateTypedBamApi.csproj b/src/GenerateTypedBamApi/GenerateTypedBamApi.csproj
@@ -8,63 +8,47 @@
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
  <AssemblyName>GenerateTypedBamApi</AssemblyName>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
  <DelaySign>false</DelaySign>
  <OutputType>Exe</OutputType>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
  <DebugSymbols>true</DebugSymbols>
  <OutputPath>bin\x86\Debug\</OutputPath>
  <DefineConstants>DEBUG;TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <DebugType>full</DebugType>
  <PlatformTarget>x86</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
  <OutputPath>bin\x86\Release\</OutputPath>
  <DefineConstants>TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <Optimize>true</Optimize>
  <PlatformTarget>x86</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
  <DebugSymbols>true</DebugSymbols>
  <OutputPath>bin\x64\Debug\</OutputPath>
  <DefineConstants>DEBUG;TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <DebugType>full</DebugType>
  <PlatformTarget>x64</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
  <OutputPath>bin\x64\Release\</OutputPath>
  <DefineConstants>TRACE</DefineConstants>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <Optimize>true</Optimize>
  <PlatformTarget>x64</PlatformTarget>
- <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
- <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
  <UseVSHostingProcess>false</UseVSHostingProcess>
  <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
  <Reference Include="System">
@@ -99,6 +83,9 @@
  <ItemGroup>
  <Content Include="Resources\TypedApi.xslt" />
  </ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
  <PreBuildEvent>

diff --git a/src/GenerateTypedBamApi/Program.cs b/src/GenerateTypedBamApi/Program.cs
@@ -94,8 +94,8 @@ private static void PrintHeader()
  Console.WriteLine(
  "BizTalk BAM API Generator "
  + assemblyVersion.Major + "." + assemblyVersion.Minor + "." + assemblyVersion.Build);
- Console.WriteLine("[http://GenerateTypedBamApi.codeplex.com/]");
- Console.WriteLine("Copyright (C) 2007-08 Darren Jefford and 2008-10 Thomas F. Abraham");
+ Console.WriteLine("[https://github.com/tfabraham/BizTalkTypedBAMAPIGenerator]");
+ Console.WriteLine("Copyright (C) 2007 Darren Jefford and 2008 Thomas F. Abraham");
  Console.WriteLine();
 
  Console.ResetColor();

diff --git a/src/GenerateTypedBamApi/Properties/AssemblyInfo.cs b/src/GenerateTypedBamApi/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GenerateTypedBamApi")]
-[assembly: AssemblyCopyright("Copyright (C) Darren Jefford 2007-08; Thomas F. Abraham 2008-17")]
+[assembly: AssemblyCopyright("Copyright (C) Darren Jefford 2007; Thomas F. Abraham 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -36,5 +36,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
diff --git a/src/GenerateTypedBamApi/Resources/TypedApi.xslt b/src/GenerateTypedBamApi/Resources/TypedApi.xslt
@@ -38,7 +38,7 @@
  ]]>
  </msxsl:script>
  <xsl:template match="bam:BAMDefinition">//
-// Generated by BizTalk BAM API Generator <xsl:value-of select="$ToolVersion"/> [http://generatetypedbamapi.codeplex.com]
+// Generated by BizTalk BAM API Generator <xsl:value-of select="$ToolVersion"/> [https://github.com/tfabraham/BizTalkTypedBAMAPIGenerator]
 <xsl:if test="$EventStreamType = 'Orchestration'">// This code requires a project reference to Microsoft.BizTalk.Bam.XLANGs.dll.</xsl:if>
 <xsl:if test="$EventStreamType != 'Orchestration'">// This code requires a project reference to Microsoft.BizTalk.Bam.EventObservation.dll.</xsl:if>
 //

diff --git a/src/GenerateTypedBamApi/app.config b/src/GenerateTypedBamApi/app.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ </startup>
+</configuration>