Skip to content

Commit 2fda22a

Browse files
committed
Fixed conflict version
1 parent 4f36614 commit 2fda22a

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

Tekla.Extension/Properties/AssemblyInfo.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@
3636

3737
// Version-specific assembly versions based on build configuration
3838
#if TEKLA2020
39-
[assembly: AssemblyVersion("2020.0.1")]
40-
[assembly: AssemblyFileVersion("2020.0.1")]
39+
[assembly: AssemblyVersion("2020.0.2")]
40+
[assembly: AssemblyFileVersion("2020.0.2")]
4141
#elif TEKLA2021
42-
[assembly: AssemblyVersion("2021.0.1")]
43-
[assembly: AssemblyFileVersion("2021.0.1")]
42+
[assembly: AssemblyVersion("2021.0.2")]
43+
[assembly: AssemblyFileVersion("2021.0.2")]
4444
#elif TEKLA2022
45-
[assembly: AssemblyVersion("2022.0.1")]
46-
[assembly: AssemblyFileVersion("2022.0.1")]
45+
[assembly: AssemblyVersion("2022.0.2")]
46+
[assembly: AssemblyFileVersion("2022.0.2")]
4747
#elif TEKLA2023
48-
[assembly: AssemblyVersion("2023.0.1")]
49-
[assembly: AssemblyFileVersion("2023.0.1")]
48+
[assembly: AssemblyVersion("2023.0.2")]
49+
[assembly: AssemblyFileVersion("2023.0.2")]
5050
#elif TEKLA2024
51-
[assembly: AssemblyVersion("2024.0.1")]
52-
[assembly: AssemblyFileVersion("2024.0.1")]
51+
[assembly: AssemblyVersion("2024.0.2")]
52+
[assembly: AssemblyFileVersion("2024.0.2")]
5353
#elif TEKLA2025
54-
[assembly: AssemblyVersion("2025.0.1")]
55-
[assembly: AssemblyFileVersion("2025.0.1")]
54+
[assembly: AssemblyVersion("2025.0.2")]
55+
[assembly: AssemblyFileVersion("2025.0.2")]
5656
#else
57-
[assembly: AssemblyVersion("2023.0.1")]
58-
[assembly: AssemblyFileVersion("2023.0.1")]
57+
[assembly: AssemblyVersion("2023.0.2")]
58+
[assembly: AssemblyFileVersion("2023.0.2")]
5959
#endif

Tekla.Extension/Tekla.Extension.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,27 +145,27 @@
145145
</ItemGroup>
146146
<!-- Tekla 2020 packages (uses legacy TeklaOpenAPI) -->
147147
<ItemGroup Condition="$(DefineConstants.Contains('TEKLA2020'))">
148-
<PackageReference Include="Tekla.Structures.All" Version="2020.0.1"/>
148+
<PackageReference Include="Tekla.Structures.All" Version="2020.0.0"/>
149149
</ItemGroup>
150150
<!-- Tekla 2021 packages -->
151151
<ItemGroup Condition="$(DefineConstants.Contains('TEKLA2021'))">
152-
<PackageReference Include="Tekla.Structures.All" Version="2021.0.1"/>
152+
<PackageReference Include="Tekla.Structures.All" Version="2021.0.0"/>
153153
</ItemGroup>
154154
<!-- Tekla 2022 packages -->
155155
<ItemGroup Condition="$(DefineConstants.Contains('TEKLA2022'))">
156-
<PackageReference Include="Tekla.Structures.All" Version="2022.0.1"/>
156+
<PackageReference Include="Tekla.Structures.All" Version="2022.0.0"/>
157157
</ItemGroup>
158158
<!-- Tekla 2023 packages -->
159159
<ItemGroup Condition="$(DefineConstants.Contains('TEKLA2023'))">
160-
<PackageReference Include="Tekla.Structures.All" Version="2023.0.1"/>
160+
<PackageReference Include="Tekla.Structures.All" Version="2023.0.0"/>
161161
</ItemGroup>
162162
<!-- Tekla 2024 packages -->
163163
<ItemGroup Condition="$(DefineConstants.Contains('TEKLA2024'))">
164-
<PackageReference Include="Tekla.Structures.All" Version="2024.0.1"/>
164+
<PackageReference Include="Tekla.Structures.All" Version="2024.0.0"/>
165165
</ItemGroup>
166166
<!-- Tekla 2025 packages -->
167167
<ItemGroup Condition="$(DefineConstants.Contains('TEKLA2025'))">
168-
<PackageReference Include="Tekla.Structures.All" Version="2025.0.1"/>
168+
<PackageReference Include="Tekla.Structures.All" Version="2025.0.0"/>
169169
</ItemGroup>
170170
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
171171
<!-- Authenticode Signing Target -->

0 commit comments

Comments
 (0)