Skip to content

Commit 2e33969

Browse files
committed
Fixed CRLF problem for batch scripts & allowed DeployExtension for RCI
+default DBG_SDK10
1 parent 0942b44 commit 2e33969

11 files changed

Lines changed: 33 additions & 31 deletions

File tree

.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

.vssbe

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"Mode": {
192192
"$type": "net.r_eg.vsSBE.Events.ModeScript, vsSolutionBuildEvent",
193193
"Type": "Script",
194-
"Command": "#[\" \n Checking of the git to define sha1, branch name, etc.\n\"]\n#[var isGit = #[IO cmd(\"git rev-parse 2>&1\")]]\n#[( $(isGit) == \"\" )\n{\n #[var branchSha1 = #[File sout(\"git\", \"rev-parse --short HEAD\")]]\n #[var branchName = #[File sout(\"git\", \"rev-parse --abbrev-ref HEAD\")]]\n #[var branchRevCount = #[File sout(\"git\", \"rev-list HEAD --count\")]]\n \n #[var csVersion = $(tplVersion.Replace(%branchName%, \"$(branchName)\").Replace(%branchSha1%, \"$(branchSha1)\").Replace(%branchRevCount%, \"$(branchRevCount)\"))]\n \n #[($(branchName) == \"HEAD\") {\n #[var branchName = $(APPVEYOR_REPO_BRANCH)]\n }]\n}\nelse {\n #[var branchSha1 =-] #[var branchName =-] #[var branchRevCount =-]\n #[var csVersion = $(tplVersion.Replace(%branchName%, \"-\").Replace(%branchSha1%, \"-\").Replace(%branchRevCount%, \"-\"))]\n}]\n\n\n#[\"\n 'vsSolutionBuildEvent' project\n\"]\n\n#[var cs = $(csVersion.Replace(\"%Version%\", \"$(numSBE.Replace('.', ', ')), $(revBuild)\").Replace(\"%namespace%\", \"\"))]\n#[var cs = $(cs.Replace(\"%VersionRevString%\", \"$(numSBE).$(revBuild)\").Replace(\"%VersionString%\", \"$(numSBE)\"))]\n#[File write(\"#[var pDir]Version.cs\"):#[var cs]]\n\n\n#[\"\n .vsixmanifest\n\"]\n\n#[( $(Configuration) ^= \"RCI_\" || $(Configuration) ^= \"REL_\" ) {\n #[var numSBE = #[var numSBE].#[var revBuild]]\n}]\n#[File replace.Regexp(\"#[var pDir]/sdk10.vsixmanifest\", \"<Version>[0-9.]+</Version>\", \"<Version>#[var numSBE]</Version>\")]\n\n#[File replace.Regexp(\"#[var pDir]/sdk15.vsixmanifest\", \"(<Identity.*?) Version=\\\"[0-9.]+\\\"\", \"$1 Version=\\\"#[var numSBE]\\\"\")]\n",
194+
"Command": "#[\" \n Checking of the git to define sha1, branch name, etc.\n\"]\n#[var isGit = #[IO cmd(\"git rev-parse 2>&1\")]]\n#[( $(isGit) == \"\" )\n{\n #[var branchSha1 = #[File sout(\"git\", \"rev-parse --short HEAD\")]]\n #[var branchName = #[File sout(\"git\", \"rev-parse --abbrev-ref HEAD\")]]\n #[var branchRevCount = #[File sout(\"git\", \"rev-list HEAD --count\")]]\n \n #[var csVersion = $(tplVersion.Replace(%branchName%, \"$(branchName)\").Replace(%branchSha1%, \"$(branchSha1)\").Replace(%branchRevCount%, \"$(branchRevCount)\"))]\n \n #[($(branchName) == \"HEAD\") {\n #[var branchName = $(APPVEYOR_REPO_BRANCH)]\n }]\n}\nelse {\n #[var branchSha1 =-] #[var branchName =-] #[var branchRevCount =-]\n #[var csVersion = $(tplVersion.Replace(%branchName%, \"-\").Replace(%branchSha1%, \"-\").Replace(%branchRevCount%, \"-\"))]\n}]\n\n\n#[\"\n 'vsSolutionBuildEvent' project\n\"]\n\n#[var cs = $(csVersion.Replace(\"%Version%\", \"$(numSBE.Replace('.', ', ')), $(revBuild)\").Replace(\"%namespace%\", \"\"))]\n#[var cs = $(cs.Replace(\"%VersionRevString%\", \"$(numSBE).$(revBuild)\").Replace(\"%VersionString%\", \"$(numSBE)\"))]\n#[File write(\"#[var pDir]Version.cs\"):#[var cs]]\n\n\n#[\"\n .vsixmanifest\n\"]\n\n#[( $(Configuration) ^= \"RCI_\" ) {\n #[var numSBE = #[var numSBE].#[var revBuild]]\n}]\n#[File replace.Regexp(\"#[var pDir]/sdk10.vsixmanifest\", \"<Version>[0-9.]+</Version>\", \"<Version>#[var numSBE]</Version>\")]\n\n#[File replace.Regexp(\"#[var pDir]/sdk15.vsixmanifest\", \"(<Identity.*?) Version=\\\"[0-9.]+\\\"\", \"$1 Version=\\\"#[var numSBE]\\\"\")]\n",
195195
"Command__": [
196196
"#[\" ",
197197
" Checking of the git to define sha1, branch name, etc.",
@@ -228,7 +228,7 @@
228228
" .vsixmanifest",
229229
"\"]",
230230
"",
231-
"#[( $(Configuration) ^= \"RCI_\" || $(Configuration) ^= \"REL_\" ) {",
231+
"#[( $(Configuration) ^= \"RCI_\" ) {",
232232
" #[var numSBE = #[var numSBE].#[var revBuild]]",
233233
"}]",
234234
"#[File replace.Regexp(\"#[var pDir]/sdk10.vsixmanifest\", \"<Version>[0-9.]+</Version>\", \"<Version>#[var numSBE]</Version>\")]",

Bridge/Bridge.csproj

Lines changed: 1 addition & 1 deletion
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>

CI.MSBuild/CI.MSBuild.csproj

Lines changed: 1 addition & 1 deletion
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>

CIMLib/CIMLib.csproj

Lines changed: 1 addition & 1 deletion
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>

ClientDemo/ClientDemo.csproj

Lines changed: 1 addition & 1 deletion
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>

Devenv/Devenv.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
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.30424</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>

Provider/Provider.csproj

Lines changed: 1 addition & 1 deletion
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>

bin/Readme.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
All final binaries will be here...
21

3-
Use ['build_x.bat'](../build) file-helpers to start build without Visual Studio like:
2+
SDK10 + SDK15
43

5-
```
6-
"msbuild.exe" "vsSolutionBuildEvent.sln" /l:"packages\vsSBE.CI.MSBuild\bin\CI.MSBuild.dll" /m:4 /p:Configuration=Debug
4+
```bat
5+
.\build {type}
76
```
87

9-
*Or click on `Build` - `Build Solution` if you have [installed plugin](https://visualstudiogallery.msdn.microsoft.com/0d1dbfd7-ed8a-40af-ae39-281bfeca2334/)*
8+
Where *{type}:*
109

11-
/**[How to build](http://vssbe.r-eg.net/doc/Dev/How%20to%20build/)** (the list of requirements etc.)
10+
* **DBG** - debug
11+
* **REL** - release
12+
* **DCI** - CI debug
13+
* **RCI** - CI release

vsSolutionBuildEvent/vsSolutionBuildEvent.csproj

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4+
<Configuration Condition=" '$(Configuration)' == '' ">DBG_SDK10</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<SchemaVersion>2.0</SchemaVersion>
77
<ProjectName>vsSolutionBuildEvent</ProjectName>
@@ -27,6 +27,7 @@
2727
<Optimize>false</Optimize>
2828
<OutputPath>bin\Debug\</OutputPath>
2929
<DefineConstants>NET_40;DEBUG;TRACE</DefineConstants>
30+
<PlatformTarget>AnyCPU</PlatformTarget>
3031
<ErrorReport>prompt</ErrorReport>
3132
<WarningLevel>4</WarningLevel>
3233
<Prefer32Bit>false</Prefer32Bit>
@@ -36,6 +37,7 @@
3637
<Optimize>true</Optimize>
3738
<OutputPath>bin\Release\</OutputPath>
3839
<DefineConstants>NET_40;CODE_ANALYSIS</DefineConstants>
40+
<PlatformTarget>AnyCPU</PlatformTarget>
3941
<ErrorReport>prompt</ErrorReport>
4042
<WarningLevel>4</WarningLevel>
4143
<RunCodeAnalysis>true</RunCodeAnalysis>
@@ -49,21 +51,17 @@
4951
<DebugType>full</DebugType>
5052
<PlatformTarget>AnyCPU</PlatformTarget>
5153
<ErrorReport>prompt</ErrorReport>
52-
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
53-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
54-
<DeployExtension>False</DeployExtension>
5554
</PropertyGroup>
5655
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RCI_SDK10|AnyCPU' ">
56+
<DebugType>pdbonly</DebugType>
57+
<Optimize>true</Optimize>
5758
<OutputPath>bin\Release\</OutputPath>
5859
<DefineConstants>NET_40;CODE_ANALYSIS</DefineConstants>
59-
<Optimize>true</Optimize>
60-
<DebugType>pdbonly</DebugType>
6160
<PlatformTarget>AnyCPU</PlatformTarget>
62-
<RunCodeAnalysis>true</RunCodeAnalysis>
6361
<ErrorReport>prompt</ErrorReport>
64-
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
65-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
66-
<DeployExtension>False</DeployExtension>
62+
<WarningLevel>4</WarningLevel>
63+
<RunCodeAnalysis>true</RunCodeAnalysis>
64+
<Prefer32Bit>false</Prefer32Bit>
6765
<DocumentationFile>bin\Release\vsSolutionBuildEvent.XML</DocumentationFile>
6866
</PropertyGroup>
6967
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'REL_SDK15|AnyCPU' ">
@@ -100,12 +98,10 @@
10098
<Optimize>true</Optimize>
10199
<DebugType>pdbonly</DebugType>
102100
<PlatformTarget>AnyCPU</PlatformTarget>
101+
<WarningLevel>4</WarningLevel>
103102
<RunCodeAnalysis>true</RunCodeAnalysis>
104103
<ErrorReport>prompt</ErrorReport>
105104
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
106-
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
107-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
108-
<DeployExtension>False</DeployExtension>
109105
<DocumentationFile>bin\Release\vsSolutionBuildEvent.XML</DocumentationFile>
110106
</PropertyGroup>
111107
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DCI_SDK15|AnyCPU' ">
@@ -118,9 +114,6 @@
118114
<PlatformTarget>AnyCPU</PlatformTarget>
119115
<ErrorReport>prompt</ErrorReport>
120116
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
121-
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
122-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
123-
<DeployExtension>False</DeployExtension>
124117
</PropertyGroup>
125118
<ItemGroup>
126119
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

0 commit comments

Comments
 (0)