Skip to content

Commit 0d44693

Browse files
Moved Interop version from RC to H
1 parent 56c5cd5 commit 0d44693

File tree

7 files changed

+55
-17
lines changed

7 files changed

+55
-17
lines changed

.gitattributes

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
# Misc
88
###############################################################################
99
*.psd1 text
10-
*.rc text eol=crlf
10+
*.rc text eol=crlf encoding=utf-16le
1111
*.zip filter=lfs diff=lfs merge=lfs -text
1212

1313
###############################################################################
1414
# Fix GitHub repo statistics
1515
###############################################################################
1616
*.h linguist-language=C++
17-
Src/Microsoft.Database.Isam/* linguist-vendored
18-
Src/Microsoft.Isam.Esent.Interop/* linguist-vendored
19-
Scripts/Modules/* linguist-vendored
2017
drsr.* linguist-vendored

Src/DSInternals.Replication.Interop/AssemblyInfo.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "pch.h"
2+
#include "version.h"
23

34
using namespace System;
45
using namespace System::Reflection;
@@ -8,17 +9,15 @@ using namespace System::Security::Permissions;
89

910
//
1011
// General Information about an assembly is controlled through the following
11-
// set of attributes. Change these attribute values to modify the information
12-
// associated with an assembly.
12+
// set of attributes. Values are defined in the version.h file.
1313
//
14-
[assembly:AssemblyTitleAttribute(L"DSInternals Replication Interop Library")];
15-
// Note: Do not forget to change the version in version.rc files.
16-
[assembly:AssemblyVersionAttribute("6.0")];
17-
[assembly:AssemblyProductAttribute(L"DSInternals PowerShell Module")];
18-
[assembly:AssemblyCopyrightAttribute(L"Copyright (c) 2015-2025 Michael Grafnetter. All rights reserved.")];
19-
[assembly:AssemblyDescriptionAttribute(L"")];
14+
[assembly:AssemblyTitleAttribute(VER_FILE_DESCRIPTION_STR)];
15+
[assembly:AssemblyVersionAttribute(VER_PRODUCT_VERSION_STR)];
16+
[assembly:AssemblyProductAttribute(VER_PRODUCT_NAME_STR)];
17+
[assembly:AssemblyCopyrightAttribute(VER_COPYRIGHT_STR)];
18+
[assembly:AssemblyDescriptionAttribute(VER_FILE_DESCRIPTION_STR)];
2019
[assembly:AssemblyConfigurationAttribute(L"")];
21-
[assembly:AssemblyCompanyAttribute(L"")];
20+
[assembly:AssemblyCompanyAttribute(VER_COMPANY_STR)];
2221
[assembly:AssemblyTrademarkAttribute(L"")];
2322
[assembly:AssemblyCultureAttribute(L"")];
2423

Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.Shared.vcxitems

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,16 @@
2626
<ClInclude Include="$(MSBuildThisFileDirectory)midl_alloc.h" />
2727
<ClInclude Include="$(MSBuildThisFileDirectory)pch.h" />
2828
<ClInclude Include="$(MSBuildThisFileDirectory)DrsConnection.h" />
29-
<ClInclude Include="$(MSBuildThisFileDirectory)drsr.h" />
29+
<ClInclude Include="$(MSBuildThisFileDirectory)drsr.h">
30+
<!-- This file is generated from the corresponding IDL file. -->
31+
<DependentUpon>$(MSBuildThisFileDirectory)drsr.idl</DependentUpon>
32+
</ClInclude>
3033
<ClInclude Include="$(MSBuildThisFileDirectory)drsr_addons.h" />
3134
<ClInclude Include="$(MSBuildThisFileDirectory)drsr_alloc.h" />
3235
<ClInclude Include="$(MSBuildThisFileDirectory)resource.h" />
3336
<ClInclude Include="$(MSBuildThisFileDirectory)RpcTypeConverter.h" />
3437
<ClInclude Include="$(MSBuildThisFileDirectory)unmanaged.h" />
38+
<ClInclude Include="$(MSBuildThisFileDirectory)version.h" />
3539
</ItemGroup>
3640
<ItemGroup>
3741
<ClCompile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cpp" />
@@ -46,6 +50,8 @@
4650
<ClCompile Include="$(MSBuildThisFileDirectory)drsr.cpp">
4751
<!-- Include files to this autogenerated MIDL => CPP file. -->
4852
<ForcedIncludeFiles>pch.h;unmanaged.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
53+
<!-- This file is generated from the corresponding IDL file. -->
54+
<DependentUpon>$(MSBuildThisFileDirectory)drsr.idl</DependentUpon>
4955
</ClCompile>
5056
</ItemGroup>
5157
<ItemGroup>

Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.Shared.vcxitems.filters

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6-
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
6+
<Extensions>cpp;c;cc;cxx;def;odl;hpj;bat;asm;asmx</Extensions>
77
</Filter>
88
<Filter Include="Header Files">
99
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
@@ -13,6 +13,10 @@
1313
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1414
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
1515
</Filter>
16+
<Filter Include="MIDL Files">
17+
<UniqueIdentifier>{4955519B-D07A-48E7-8EB7-472F946A745F}</UniqueIdentifier>
18+
<Extensions>idl</Extensions>
19+
</Filter>
1620
</ItemGroup>
1721
<ItemGroup>
1822
<ClInclude Include="$(MSBuildThisFileDirectory)drsr_imports.h">
@@ -45,6 +49,9 @@
4549
<ClInclude Include="$(MSBuildThisFileDirectory)resource.h">
4650
<Filter>Header Files</Filter>
4751
</ClInclude>
52+
<ClInclude Include="$(MSBuildThisFileDirectory)version.h">
53+
<Filter>Header Files</Filter>
54+
</ClInclude>
4855
</ItemGroup>
4956
<ItemGroup>
5057
<ClCompile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cpp">
@@ -74,10 +81,10 @@
7481
</ItemGroup>
7582
<ItemGroup>
7683
<Midl Include="$(MSBuildThisFileDirectory)drsr.idl">
77-
<Filter>Source Files</Filter>
84+
<Filter>MIDL Files</Filter>
7885
</Midl>
7986
<Midl Include="$(MSBuildThisFileDirectory)drsr_imports.idl">
80-
<Filter>Source Files</Filter>
87+
<Filter>MIDL Files</Filter>
8188
</Midl>
8289
</ItemGroup>
8390
<ItemGroup>

Src/DSInternals.Replication.Interop/resource.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212
#define _APS_NEXT_SYMED_VALUE 101
1313
#endif
1414
#endif
15+
16+
// Include the assembly version information header file
17+
#include "version.h"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Version information defined in this header file
2+
// is used in version.rc and in AssemblyInfo.cpp.
3+
#pragma once
4+
5+
#define STRINGIZE2(s) #s
6+
#define STRINGIZE(s) STRINGIZE2(s)
7+
8+
#define VERSION_MAJOR 6
9+
#define VERSION_MINOR 0
10+
#define VERSION_REVISION 0
11+
#define VERSION_BUILD 0
12+
13+
// Build file and product version strings
14+
#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
15+
#define VER_FILE_VERSION_STR STRINGIZE(VERSION_MAJOR) \
16+
"." STRINGIZE(VERSION_MINOR) \
17+
"." STRINGIZE(VERSION_REVISION) \
18+
"." STRINGIZE(VERSION_BUILD) \
19+
20+
#define VER_PRODUCT_VERSION VER_FILE_VERSION
21+
#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR
22+
23+
#define VER_FILE_DESCRIPTION_STR "DSInternals Replication Interop Library"
24+
#define VER_COPYRIGHT_STR "Copyright (c) 2015-2025 Michael Grafnetter. All rights reserved."
25+
#define VER_COMPANY_STR "Michael Grafnetter"
26+
#define VER_PRODUCT_NAME_STR "DSInternals PowerShell Module"
-72 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)