Skip to content

Commit 1b31b0c

Browse files
StephenMolloyStephenMolloy
authored
Solution cleanup (#23)
* Update solution to build on cmd line and VS2017, and hopefully in build pipeline. * Fix versions * Project build order; Update .gitignore ; Include SQL in Release builds * Verify signing on .nupkg files only. * Don't rev version numbers for a build environment cleanup. No code changed.
1 parent c3f8126 commit 1b31b0c

File tree

30 files changed

+238
-395
lines changed

30 files changed

+238
-395
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
.vs/
44
msbuild.*
55
obj/
6-
/packages/
6+
/packages/
7+
.binaries/

‎.nuget/NuGet.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
5959
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
6060

61-
<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
61+
<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir)"</PaddedSolutionDir>
6262
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
6363

6464
<!-- Commands -->

‎Microsoft.Aspnet.SessionState.sln

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SessionSta
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test", "test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test.csproj", "{2AF89ACA-3545-432D-8D99-C5230E8643A8}"
1919
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{78F4C27F-37B4-4D27-B198-F601359EC691}"
21+
ProjectSection(SolutionItems) = preProject
22+
tools\CosmosDBSessionStateProviderAsync.settings.targets = tools\CosmosDBSessionStateProviderAsync.settings.targets
23+
tools\MicrosoftAspNetSessionState.settings.targets = tools\MicrosoftAspNetSessionState.settings.targets
24+
tools\SessionStateModule.settings.targets = tools\SessionStateModule.settings.targets
25+
tools\SqlSessionStateProviderAsync.settings.targets = tools\SqlSessionStateProviderAsync.settings.targets
26+
tools\version.targets = tools\version.targets
27+
EndProjectSection
28+
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packages", "src\packages\Packages.csproj", "{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}"
30+
ProjectSection(ProjectDependencies) = postProject
31+
{7238F90D-3BCE-4F40-A5BA-EA36AD484BD6} = {7238F90D-3BCE-4F40-A5BA-EA36AD484BD6}
32+
{493B0482-572A-4465-BD52-4094351C2647} = {493B0482-572A-4465-BD52-4094351C2647}
33+
{4CFB2896-D5C1-4E96-A3DA-D57C58539209} = {4CFB2896-D5C1-4E96-A3DA-D57C58539209}
34+
EndProjectSection
35+
EndProject
2036
Global
2137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2238
Debug|Any CPU = Debug|Any CPU
@@ -26,6 +42,7 @@ Global
2642
{493B0482-572A-4465-BD52-4094351C2647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2743
{493B0482-572A-4465-BD52-4094351C2647}.Debug|Any CPU.Build.0 = Debug|Any CPU
2844
{493B0482-572A-4465-BD52-4094351C2647}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{493B0482-572A-4465-BD52-4094351C2647}.Release|Any CPU.Build.0 = Release|Any CPU
2946
{4CFB2896-D5C1-4E96-A3DA-D57C58539209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3047
{4CFB2896-D5C1-4E96-A3DA-D57C58539209}.Debug|Any CPU.Build.0 = Debug|Any CPU
3148
{4CFB2896-D5C1-4E96-A3DA-D57C58539209}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -42,6 +59,10 @@ Global
4259
{2AF89ACA-3545-432D-8D99-C5230E8643A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
4360
{2AF89ACA-3545-432D-8D99-C5230E8643A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
4461
{2AF89ACA-3545-432D-8D99-C5230E8643A8}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{7EC5863F-7FF1-41C7-A384-8FFF81531E7A}.Release|Any CPU.Build.0 = Release|Any CPU
4566
EndGlobalSection
4667
GlobalSection(SolutionProperties) = preSolution
4768
HideSolutionNode = FALSE
@@ -52,6 +73,7 @@ Global
5273
{7238F90D-3BCE-4F40-A5BA-EA36AD484BD6} = {58E8143E-86D8-4CA3-AAC3-1CF253D91207}
5374
{CBB00B6C-8A44-43F0-BE73-0B0E8565F8A2} = {93AD624B-85A6-4EE9-B40E-42914D40C0CF}
5475
{2AF89ACA-3545-432D-8D99-C5230E8643A8} = {93AD624B-85A6-4EE9-B40E-42914D40C0CF}
76+
{7EC5863F-7FF1-41C7-A384-8FFF81531E7A} = {58E8143E-86D8-4CA3-AAC3-1CF253D91207}
5577
EndGlobalSection
5678
GlobalSection(ExtensibilityGlobals) = postSolution
5779
SolutionGuid = {4853AD21-0DCE-40D8-A3B9-19081B71C364}

‎MicrosoftAspNetSessionState.msbuild

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="tools\MicrosoftAspNetSessionState.settings.targets"/>
32

43
<ItemGroup>
54
<AssemblyProject Include="src\SessionStateModule\Microsoft.AspNet.SessionState.SessionStateModule.csproj" />
65
<AssemblyProject Include="src\SqlSessionStateProviderAsync\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj" />
76
<AssemblyProject Include="src\CosmosDBSessionStateProviderAsync\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.csproj" />
87
</ItemGroup>
8+
99
<ItemGroup>
1010
<TestProject Include="test\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test\Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj" />
1111
<TestProject Include="test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test\Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.Test.csproj" />
@@ -15,18 +15,33 @@
1515
</ItemGroup>
1616

1717
<Target Name="Build" DependsOnTargets="BuildAssemblies;UnitTest;BuildPackages" />
18-
<Target Name="Clean" DependsOnTargets="CleanPackages;CleanAssemblies" />
18+
<Target Name="BuildAll" DependsOnTargets="BuildAssemblies;BuildSamples;UnitTest;BuildPackages" />
19+
<Target Name="Clean" DependsOnTargets="CleanPackages;CleanSamples;CleanTests;CleanAssemblies" />
1920
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
2021

2122
<Target Name="BuildAssemblies" DependsOnTargets="RestorePackages">
22-
<MSBuild Targets="Build" Projects="@(AssemblyProject);@(TestProject)" />
23+
<MSBuild Targets="Build" Projects="@(AssemblyProject)" />
2324
</Target>
2425

26+
<Target Name="BuildTests" DependsOnTargets="RestorePackages">
27+
<MSBuild Targets="Build" Projects="@(TestProject)" />
28+
</Target>
29+
30+
<Target Name="BuildSamples" DependsOnTargets="RestorePackages">
31+
<MSBuild Targets="Build" Projects="@(SampleProject)" />
32+
</Target>
33+
2534
<Target Name="CleanAssemblies">
26-
<MSBuild Targets="Clean" Projects="Microsoft.Aspnet.SessionState.sln" />
35+
<MSBuild Targets="Clean" Projects="@(AssemblyProject)" />
36+
</Target>
37+
38+
<Target Name="CleanTests">
39+
<MSBuild Targets="Clean" Projects="@(TestProject)" />
2740
</Target>
2841

29-
<Target Name="RebuildAssemblies" DependsOnTargets="Clean;Build" />
42+
<Target Name="CleanSamples">
43+
<MSBuild Targets="Clean" Projects="@(SampleProject)" />
44+
</Target>
3045

3146
<!-- Packages build -->
3247

@@ -45,9 +60,8 @@
4560
</Target>
4661

4762

48-
<Target Name="UnitTest">
63+
<Target Name="UnitTest" DependsOnTargets="BuildTests">
4964
<MSBuild Targets="XunitTest" Projects="@(TestProject)" />
5065
</Target>
5166

52-
<Import Project="tools\MicrosoftAspNetSessionState.targets"/>
5367
</Project>

‎build.cmd

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
@ECHO OFF
22

33
setlocal
4+
set EnableNuGetPackageRestore=true
45

5-
set logOptions=/flp:Summary;Verbosity=m;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
6+
set MSBUILDEXE=msbuild.exe
7+
8+
set cfgOption=/p:Configuration=Release
9+
REM set cfgOption=/p:Configuration=Debug
10+
REM set cfgOption=/p:Configuration=Debug;Release
11+
if not "%1"=="" set cfgOption=/p:Configuration=
12+
13+
set logOptions=/v:n /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
614

715
echo Please build from VS 2015(or newer version) Developer Command Prompt
816

917
:BUILD
10-
msbuild "%~dp0\MicrosoftAspNetSessionState.msbuild" %logOptions% /v:m /maxcpucount /nodeReuse:false %*
18+
%MSBUILDEXE% "%~dp0\MicrosoftAspNetSessionState.msbuild" /t:BuildAll %logOptions% /maxcpucount /nodeReuse:false %cfgOption%%*
1119

1220
endlocal

‎clean.cmd

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@ECHO OFF
2+
3+
setlocal
4+
5+
set MSBUILDEXE=msbuild.exe
6+
7+
set cfgOption=/p:Configuration=Release
8+
REM set cfgOption=/p:Configuration=Debug
9+
REM set cfgOption=/p:Configuration=Debug;Release
10+
if not "%1"=="" set cfgOption=/p:Configuration=
11+
12+
set logOptions=/v:n /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
13+
14+
echo Please build from VS 2015(or newer version) Developer Command Prompt
15+
16+
:BUILD
17+
%MSBUILDEXE% "%~dp0\MicrosoftAspNetSessionState.msbuild" /t:Clean %logOptions% /maxcpucount /nodeReuse:false %cfgOption%%*
18+
del /F msbuild.log
19+
del /F msbuild.wrn
20+
del /F msbuild.err
21+
22+
endlocal

‎src/CosmosDBSessionStateProviderAsync/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\CosmosDBSessionStateProviderAsync.settings.targets" />
5-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
87
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -89,11 +88,11 @@
8988
</EmbeddedResource>
9089
</ItemGroup>
9190
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
92-
<Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets')" />
9391
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9492
<PropertyGroup>
9593
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9694
</PropertyGroup>
9795
<Error Condition="!Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets'))" />
9896
</Target>
97+
<Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.15.0\build\Microsoft.Azure.DocumentDB.targets')" />
9998
</Project>

‎src/SessionStateModule/Microsoft.AspNet.SessionState.SessionStateModule.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SessionStateModule.settings.targets" />
5-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
87
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -81,11 +80,4 @@
8180
<None Include="35MSSharedLib1024.snk" />
8281
</ItemGroup>
8382
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
84-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
85-
Other similar extension points exist, see Microsoft.Common.targets.
86-
<Target Name="BeforeBuild">
87-
</Target>
88-
<Target Name="AfterBuild">
89-
</Target>
90-
-->
9183
</Project>

‎src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SqlSessionStateProviderAsync.settings.targets" />
5-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
87
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -94,18 +93,10 @@
9493
</ProjectReference>
9594
</ItemGroup>
9695
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
9896
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9997
<PropertyGroup>
10098
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
10199
</PropertyGroup>
102100
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
103101
</Target>
104-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
105-
Other similar extension points exist, see Microsoft.Common.targets.
106-
<Target Name="BeforeBuild">
107-
</Target>
108-
<Target Name="AfterBuild">
109-
</Target>
110-
-->
111102
</Project>

‎src/packages/CosmosDBSessionStateProviderAsync.nupkg/Microsoft.AspNet.SessionState.CosmosDBSessionStateProviderAsync.nuproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\CosmosDBSessionStateProviderAsync.settings.targets" />
4-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\MicrosoftAspNetSessionState.settings.targets" />
54
<PropertyGroup>
65
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
76
<NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>

0 commit comments

Comments
 (0)