From 77589b630dff0b8f934075bb68d71da70fd803a7 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Wed, 21 Dec 2022 19:54:06 +0100 Subject: [PATCH] fix: patch version correctly in tekla 2022 (#2035) * fix: patch version correctly in tekla 2022 * fix(tekla): removes unused nuget --- .../ConnectorTeklaStructures2020.csproj | 3 - .../Properties/AssemblyInfo.cs | 6 +- .../ConnectorTeklaStructures2021.csproj | 15 -- .../ConnectorTeklaStructures2021/Manifest.xml | 38 ---- .../ManifestGenerator.tt | 75 ------- .../ManifestGenerator.xml | 200 ------------------ .../ConnectorTeklaStructures2022.csproj | 8 + .../Properties/AssemblyInfo.cs | 37 ++++ 8 files changed, 48 insertions(+), 334 deletions(-) delete mode 100644 ConnectorTeklaStructures/ConnectorTeklaStructures2021/Manifest.xml delete mode 100644 ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.tt delete mode 100644 ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.xml create mode 100644 ConnectorTeklaStructures/ConnectorTeklaStructures2022/Properties/AssemblyInfo.cs diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2020/ConnectorTeklaStructures2020.csproj b/ConnectorTeklaStructures/ConnectorTeklaStructures2020/ConnectorTeklaStructures2020.csproj index 53e8fbe6ca..8b4e8f9d08 100644 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2020/ConnectorTeklaStructures2020.csproj +++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2020/ConnectorTeklaStructures2020.csproj @@ -93,9 +93,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - 1.3.6 - 2020.0.3 diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2020/Properties/AssemblyInfo.cs b/ConnectorTeklaStructures/ConnectorTeklaStructures2020/Properties/AssemblyInfo.cs index 229a2b1ef6..f5ba4b8c71 100644 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2020/Properties/AssemblyInfo.cs +++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2020/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyInformationalVersion("2.0.0-beta")] \ No newline at end of file diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ConnectorTeklaStructures2021.csproj b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ConnectorTeklaStructures2021.csproj index 9954465d37..2336b0947e 100644 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ConnectorTeklaStructures2021.csproj +++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ConnectorTeklaStructures2021.csproj @@ -89,25 +89,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - 1.3.6 - 2021.0.1 - - - - TextTemplatingFileGenerator - ManifestGenerator.xml - - - True - True - ManifestGenerator.tt - - diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/Manifest.xml b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/Manifest.xml deleted file mode 100644 index 72e92ddce0..0000000000 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/Manifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.tt b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.tt deleted file mode 100644 index dbea027341..0000000000 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.tt +++ /dev/null @@ -1,75 +0,0 @@ -<#@ template language="C#" #> -<#@ output extension=".xml"#> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> -<#@ import namespace="System.IO" #> -<# - var buildPath = $@".\bin\Release"; - - var CiPath2 = $@"C:\Users\circleci\project\ConnectorTeklaStructures\ConnectorTeklaStructures2021\bin\Release"; - var files = Directory.EnumerateFiles(buildPath, "*.dll"); - var CiPath = $@"C:\Users\circleci\project\ConnectorTeklaStructures\ConnectorTeklaStructures2021\bin\Release\"; - var enumerateDirectories = Directory.EnumerateDirectories(buildPath); - var emptyFiles = new List() {}; - foreach (var dir in enumerateDirectories) - { - var files2 = Directory.EnumerateFiles(dir, "*.dll"); - foreach (var file in files2) - { - emptyFiles.Add(file); - } - } - -#> - - - - - - - - - - - - - - - - - - - - - - - - - - - -<# - foreach (var path in files) - { -#> - -<# - } -#> -<#foreach (var path in emptyFiles){ -#> - " Source="<#= CiPath2 + path.Replace(buildPath, "") #>" Target= "<#= "%BinariesTargetDirectory%\\" + path.Replace(buildPath, "").Split('\\' )[1] #>"/> -<# - } -#> - - - - - - - \ No newline at end of file diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.xml b/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.xml deleted file mode 100644 index c8edc8a7b6..0000000000 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2021/ManifestGenerator.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2022/ConnectorTeklaStructures2022.csproj b/ConnectorTeklaStructures/ConnectorTeklaStructures2022/ConnectorTeklaStructures2022.csproj index 3a8783dadd..3e34192af1 100644 --- a/ConnectorTeklaStructures/ConnectorTeklaStructures2022/ConnectorTeklaStructures2022.csproj +++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2022/ConnectorTeklaStructures2022.csproj @@ -80,6 +80,11 @@ 0.10.18 + + 1.3.0 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + 2022.0.10715 @@ -96,6 +101,9 @@ + + + diff --git a/ConnectorTeklaStructures/ConnectorTeklaStructures2022/Properties/AssemblyInfo.cs b/ConnectorTeklaStructures/ConnectorTeklaStructures2022/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..62b78d7780 --- /dev/null +++ b/ConnectorTeklaStructures/ConnectorTeklaStructures2022/Properties/AssemblyInfo.cs @@ -0,0 +1,37 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ConnectorTeklaStructures2022")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ConnectorTeklaStructures2022")] +[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("FC48ACCE-EA9B-440C-B38F-63223E94F296")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyInformationalVersion("2.0.0-beta")] \ No newline at end of file