Skip to content

Commit 2a77778

Browse files
committed
fix build system issue
1 parent 4570ec9 commit 2a77778

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

MicrosoftAspNetSessionState.msbuild

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="tools\MicrosoftAspNetSessionState.settings.targets"/>
3-
<Import Project="tools\CI\CITask.targets" Condition="Exists('tools\CI\CITask.targets')"/>
2+
<Import Project="tools\MicrosoftAspNetSessionState.settings.targets"/>
43

54
<ItemGroup>
65
<AssemblyProject Include="src\SessionStateModule\Microsoft.AspNet.SessionState.SessionStateModule.csproj" />

tools/CI/CITask.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@
6161
<CodeSignIntermediateOutputPath Condition="'$(CodeSignIntermediateOutputPath)' == ''">$(ObjPath)CodeSign\</CodeSignIntermediateOutputPath>
6262
</PropertyGroup>
6363

64-
<PropertyGroup>
65-
<AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
66-
<AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
67-
</PropertyGroup>
68-
6964
<ItemGroup>
7065
<CodeSign Include="$(OutputPath)Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.dll">
7166
<AuthCodeCert>10006</AuthCodeCert>

tools/MicrosoftAspNetSessionState.Extensions.settings.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
23
<PropertyGroup>
34
<RepositoryRootEx Condition="'$(RepositoryRootEx)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\</RepositoryRootEx>
45
</PropertyGroup>
@@ -16,6 +17,8 @@
1617
<BuildingTestProject Condition="$(MSBuildProjectDirectory.ToLower().Contains($(TestRoot.ToLower())))">true</BuildingTestProject>
1718
</PropertyGroup>
1819

20+
<Import Project="$(MSBuildThisFileDirectory)CI\CITask.targets" Condition="Exists('$(MSBuildThisFileDirectory)CI\CITask.targets')"/>
21+
1922
<PropertyGroup>
2023
<AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
2124
<AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>

0 commit comments

Comments
 (0)