Skip to content
Snippets Groups Projects
Commit 11f738a9 authored by Michal Ondrejička's avatar Michal Ondrejička
Browse files

Merge branch 'develop' into 'master' 

ver2

See merge request digital-twin/twinzo/tdevkit!9
parents 8ef568a5 437c5abf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Main/Main.csproj
+ 2
− 2
View file @ 11f738a9
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyVersion>2021.6.16.1</AssemblyVersion> <AssemblyVersion>2021.6.16.2</AssemblyVersion>
<FileVersion>2021.6.16.1</FileVersion> <FileVersion>2021.6.16.2</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
SDK/SDK.csproj
+ 15
− 2
View file @ 11f738a9
...@@ -3,11 +3,24 @@ ...@@ -3,11 +3,24 @@
<PropertyGroup> <PropertyGroup>
<PackageId>tDevKit</PackageId> <PackageId>tDevKit</PackageId>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyVersion>2021.6.16.1</AssemblyVersion> <AssemblyVersion>2021.6.16.2</AssemblyVersion>
<FileVersion>2021.6.16.1</FileVersion> <FileVersion>2021.6.16.2</FileVersion>
<Version>2021.6.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<ShouldCreateLogs>True</ShouldCreateLogs>
<AdvancedSettingsExpanded>True</AdvancedSettingsExpanded>
<UpdateAssemblyVersion>False</UpdateAssemblyVersion>
<UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
<UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
<UpdatePackageVersion>True</UpdatePackageVersion>
<PackageVersionSettings>AssemblyVersion.IncrementWithAutoReset.None</PackageVersionSettings>
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ShouldCreateLogs>True</ShouldCreateLogs> <ShouldCreateLogs>True</ShouldCreateLogs>
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded> <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
<UpdateAssemblyVersion>False</UpdateAssemblyVersion> <UpdateAssemblyVersion>False</UpdateAssemblyVersion>
......
Test/Test/Test.csproj
+ 2
− 2
View file @ 11f738a9
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<AssemblyVersion>2021.6.16.1</AssemblyVersion> <AssemblyVersion>2021.6.16.2</AssemblyVersion>
<FileVersion>2021.6.16.1</FileVersion> <FileVersion>2021.6.16.2</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment