Skip to content

Commit 24d3a26

Browse files
committed
Merge remote-tracking branch 'origin/dev' into fix/default-machine-location
2 parents 0a017ae + a39df2d commit 24d3a26

File tree

64 files changed

+2292
-1398
lines changed

Some content is hidden

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

64 files changed

+2292
-1398
lines changed

.build/BuildToolkit.ps1

Lines changed: 0 additions & 680 deletions
This file was deleted.

.build/Common.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project>
22

33
<PropertyGroup>
4-
<AssemblyVersion>0.0.0</AssemblyVersion>
4+
<AssemblyVersion>8.0.0</AssemblyVersion>
55
<AssemblyVersion Condition="'$(MORYX_ASSEMBLY_VERSION)'!=''">$(MORYX_ASSEMBLY_VERSION)</AssemblyVersion>
66

7-
<FileVersion>0.0.0.0</FileVersion>
7+
<FileVersion>8.0.0.0</FileVersion>
88
<FileVersion Condition="'$(MORYX_FILE_VERSION)'!=''">$(MORYX_FILE_VERSION)</FileVersion>
99

10-
<InformationalVersion>0.0.0.0</InformationalVersion>
10+
<InformationalVersion>8.0.0.0</InformationalVersion>
1111
<InformationalVersion Condition="'$(MORYX_INFORMATIONAL_VERSION)'!=''">$(MORYX_INFORMATIONAL_VERSION)</InformationalVersion>
1212

13-
<PackageVersion>0.0.0</PackageVersion>
13+
<PackageVersion>8.0.0</PackageVersion>
1414
<PackageVersion Condition="'$(MORYX_PACKAGE_VERSION)'!=''">$(MORYX_PACKAGE_VERSION)</PackageVersion>
1515

1616
<Authors>PHOENIXCONTACT</Authors>
@@ -28,4 +28,4 @@
2828
<None Include="$(MSBuildThisFileDirectory)\moryx-logo.png" Pack="true" PackagePath=""/>
2929
</ItemGroup>
3030

31-
</Project>
31+
</Project>

.build/Output.ps1

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)