Skip to content

Commit 8fc64b2

Browse files
3F3F
authored
Merge pull request #45 from 3F/support/vs15+
Support of the modern 15+ products
2 parents 96149e3 + 2e33969 commit 8fc64b2

66 files changed

Lines changed: 2427 additions & 976 deletions

Some content is hidden

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

‎.gitattributes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
# Our batch files requires CRLF for correct work.
3+
# https://github.com/3F/hMSBuild/issues/2
4+
5+
*.bat text eol=crlf
6+
*.cmd text eol=crlf
7+
*.tpl text eol=crlf

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## Specific
22

3+
/vsSolutionBuildEvent/source.extension.vsixmanifest
4+
35
/vsSolutionBuildEvent/Version.cs
46
/Bridge/Version.cs
57
/CI.MSBuild/Version.cs

‎.gnt/gnt.core‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎.vssbe‎

Lines changed: 155 additions & 81 deletions
Large diffs are not rendered by default.

‎Bridge/Bridge.csproj‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Configuration Condition=" '$(Configuration)' == '' ">DBG_SDK10</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
@@ -12,48 +12,46 @@
1212
<AssemblyName>Bridge</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<NetTargetVName>net40</NetTargetVName>
15-
<DefineConstants>NET_40</DefineConstants>
1615
<FileAlignment>512</FileAlignment>
1716
<vsSBE_SDK>1.1.0</vsSBE_SDK>
17+
<NoWarn>CS1591;IDE1006</NoWarn>
1818
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DBG_SDK10|AnyCPU' ">
2020
<DebugSymbols>true</DebugSymbols>
2121
<DebugType>full</DebugType>
2222
<Optimize>false</Optimize>
2323
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
24+
<DefineConstants>NET_40;DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
2727
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK10|AnyCPU' ">
2929
<DebugType>pdbonly</DebugType>
3030
<Optimize>true</Optimize>
3131
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>$(DefineConstants)</DefineConstants>
32+
<DefineConstants>NET_40</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
35-
<NoWarn>CS1591</NoWarn>
3635
<DocumentationFile>bin\Release\Bridge.XML</DocumentationFile>
3736
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_net45|AnyCPU'">
39-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
37+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK15|AnyCPU' ">
38+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
4039
<NetTargetVName>net45</NetTargetVName>
4140
<OutputPath>bin\Release\</OutputPath>
42-
<DefineConstants>NET_45</DefineConstants>
41+
<DefineConstants></DefineConstants>
4342
<Optimize>true</Optimize>
4443
<DebugType>pdbonly</DebugType>
4544
<PlatformTarget>AnyCPU</PlatformTarget>
4645
<ErrorReport>prompt</ErrorReport>
4746
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4847
<DocumentationFile>bin\Release\Bridge.XML</DocumentationFile>
49-
<NoWarn>CS1591</NoWarn>
5048
</PropertyGroup>
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_net45|AnyCPU'">
52-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
49+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DBG_SDK15|AnyCPU' ">
50+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
5351
<NetTargetVName>net45</NetTargetVName>
5452
<DebugSymbols>true</DebugSymbols>
5553
<OutputPath>bin\Debug\</OutputPath>
56-
<DefineConstants>NET_45;DEBUG;TRACE</DefineConstants>
54+
<DefineConstants>DEBUG;TRACE</DefineConstants>
5755
<DebugType>full</DebugType>
5856
<PlatformTarget>AnyCPU</PlatformTarget>
5957
<ErrorReport>prompt</ErrorReport>

‎CI.MSBuild/CI.MSBuild.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ REM # The documentation: http://vssbe.r-eg.net/doc/CI/CI.MSBuild/
33

44
set cimdll=CI.MSBuild.dll
55

6-
msbuild %* /l:"%~dp0%cimdll%" /nologo
6+
hMSBuild %* /l:"%~dp0%cimdll%" /nologo

‎CI.MSBuild/CI.MSBuild.csproj‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Configuration Condition=" '$(Configuration)' == '' ">DBG_SDK10</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
@@ -14,47 +14,45 @@
1414
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1515
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<NetTargetVName>net40</NetTargetVName>
17-
<DefineConstants>NET_40</DefineConstants>
1817
<FileAlignment>512</FileAlignment>
18+
<NoWarn>CS1591;IDE1006</NoWarn>
1919
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DBG_SDK10|AnyCPU' ">
2121
<DebugSymbols>true</DebugSymbols>
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
2424
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
25+
<DefineConstants>NET_40;DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK10|AnyCPU' ">
3030
<DebugType>pdbonly</DebugType>
3131
<Optimize>true</Optimize>
3232
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>$(DefineConstants)</DefineConstants>
33+
<DefineConstants>NET_40</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
3636
<DocumentationFile>bin\Release\CI.MSBuild.XML</DocumentationFile>
37-
<NoWarn>CS1591</NoWarn>
3837
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_net45|AnyCPU'">
40-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
38+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK15|AnyCPU' ">
39+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
4140
<NetTargetVName>net45</NetTargetVName>
4241
<OutputPath>bin\Release\</OutputPath>
43-
<DefineConstants>NET_45</DefineConstants>
42+
<DefineConstants></DefineConstants>
4443
<Optimize>true</Optimize>
4544
<DebugType>pdbonly</DebugType>
4645
<PlatformTarget>AnyCPU</PlatformTarget>
4746
<ErrorReport>prompt</ErrorReport>
4847
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4948
<DocumentationFile>bin\Release\CI.MSBuild.XML</DocumentationFile>
50-
<NoWarn>CS1591</NoWarn>
5149
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_net45|AnyCPU'">
53-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
50+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DBG_SDK15|AnyCPU' ">
51+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
5452
<NetTargetVName>net45</NetTargetVName>
5553
<DebugSymbols>true</DebugSymbols>
5654
<OutputPath>bin\Debug\</OutputPath>
57-
<DefineConstants>NET_45;DEBUG;TRACE</DefineConstants>
55+
<DefineConstants>DEBUG;TRACE</DefineConstants>
5856
<DebugType>full</DebugType>
5957
<PlatformTarget>AnyCPU</PlatformTarget>
6058
<ErrorReport>prompt</ErrorReport>
@@ -94,7 +92,7 @@
9492
<None Include="$(SolutionDir)\tools\gnt.bat">
9593
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9694
</None>
97-
<None Include="$(SolutionDir)\tools\msbuild.bat">
95+
<None Include="$(SolutionDir)\tools\hMSBuild.bat">
9896
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9997
</None>
10098
<None Include="CI.MSBuild.bat">

‎CIMLib/CIMLib.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
4+
<Configuration Condition=" '$(Configuration)' == '' ">REL_SDK10</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
@@ -13,26 +13,26 @@
1313
<AssemblyName>CIMLib</AssemblyName>
1414
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1515
<NetTargetVName>net40</NetTargetVName>
16-
<DefineConstants>NET_40</DefineConstants>
1716
<FileAlignment>512</FileAlignment>
17+
<NoWarn>CS1591;IDE1006</NoWarn>
1818
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK10|AnyCPU' ">
2020
<PlatformTarget>AnyCPU</PlatformTarget>
2121
<DebugType>pdbonly</DebugType>
2222
<Optimize>true</Optimize>
2323
<OutputPath>bin\</OutputPath>
24-
<DefineConstants>$(DefineConstants)</DefineConstants>
24+
<DefineConstants>NET_40</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>3</WarningLevel>
2727
<Prefer32Bit>false</Prefer32Bit>
2828
<DebugSymbols>true</DebugSymbols>
2929
</PropertyGroup>
30-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_net45|AnyCPU'">
31-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK15|AnyCPU' ">
31+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
3232
<NetTargetVName>net45</NetTargetVName>
3333
<DebugSymbols>true</DebugSymbols>
3434
<OutputPath>bin\</OutputPath>
35-
<DefineConstants>NET_45</DefineConstants>
35+
<DefineConstants></DefineConstants>
3636
<Optimize>true</Optimize>
3737
<WarningLevel>3</WarningLevel>
3838
<DebugType>pdbonly</DebugType>

‎ClientDemo/ClientDemo.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Configuration Condition=" '$(Configuration)' == '' ">DBG_SDK10</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{9673A8FC-07E1-4BB3-A97E-020481A5275E}</ProjectGuid>
77
<OutputType>Library</OutputType>
@@ -12,43 +12,43 @@
1212
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<NetTargetVName>net40</NetTargetVName>
15-
<DefineConstants>NET_40</DefineConstants>
1615
<FileAlignment>512</FileAlignment>
16+
<NoWarn>CS1591;IDE1006</NoWarn>
1717
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DBG_SDK10|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
2222
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
23+
<DefineConstants>NET_40;DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
2626
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK10|AnyCPU' ">
2828
<DebugType>pdbonly</DebugType>
2929
<Optimize>true</Optimize>
3030
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>$(DefineConstants)</DefineConstants>
31+
<DefineConstants>NET_40</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
35-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_net45|AnyCPU'">
36-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
35+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK15|AnyCPU' ">
36+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
3737
<NetTargetVName>net45</NetTargetVName>
3838
<OutputPath>bin\Release\</OutputPath>
39-
<DefineConstants>NET_45</DefineConstants>
39+
<DefineConstants></DefineConstants>
4040
<Optimize>true</Optimize>
4141
<DebugType>pdbonly</DebugType>
4242
<PlatformTarget>AnyCPU</PlatformTarget>
4343
<ErrorReport>prompt</ErrorReport>
4444
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4545
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_net45|AnyCPU'">
47-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
46+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DBG_SDK15|AnyCPU' ">
47+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
4848
<NetTargetVName>net45</NetTargetVName>
4949
<DebugSymbols>true</DebugSymbols>
5050
<OutputPath>bin\Debug\</OutputPath>
51-
<DefineConstants>NET_45;DEBUG;TRACE</DefineConstants>
51+
<DefineConstants>DEBUG;TRACE</DefineConstants>
5252
<DebugType>full</DebugType>
5353
<PlatformTarget>AnyCPU</PlatformTarget>
5454
<ErrorReport>prompt</ErrorReport>

‎Devenv/Devenv.AddIn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<Version>12.0</Version>
1414
</HostApplication>
1515
<Addin>
16-
<FriendlyName>vsSolutionBuildEvent Devenv Command-Line</FriendlyName>
17-
<Description>Add-in to vsSolutionBuildEvent</Description>
16+
<FriendlyName>vsSolutionBuildEvent Devenv</FriendlyName>
17+
<Description>vsSolutionBuildEvent Devenv Command-Line version</Description>
1818
<Assembly>Devenv/Devenv.dll</Assembly>
1919
<FullClassName>net.r_eg.vsSBE.Devenv.Connect</FullClassName>
2020
<LoadBehavior>4</LoadBehavior>

0 commit comments

Comments
 (0)