Skip to content

Commit 9eacfbc

Browse files
evestevest
committed
New releases including pr19
Also fixed a few build issues. Creating packages should be done using the build-packages.cmd file to prevent VS from reusing the previous build from the /obj directory.
1 parent 4074ae3 commit 9eacfbc

10 files changed

+74
-39
lines changed

‎src/AssemblyInfo.Cms10.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
using System.Reflection;
2-
[assembly: AssemblyVersion("10.0.0")]
2+
[assembly: AssemblyVersion("10.1.0")]

‎src/AssemblyInfo.Cms8.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
using System.Reflection;
2-
[assembly: AssemblyVersion("8.0.0")]
2+
[assembly: AssemblyVersion("8.1.0")]

‎src/AssemblyInfo.Cms9.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
using System.Reflection;
2-
[assembly: AssemblyVersion("9.0.0")]
2+
[assembly: AssemblyVersion("9.1.0")]

‎src/BVNetwork.404Handler.Cms8.Version.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<PackageVersion Condition="$(PackageVersion) == ''">8.0.0</PackageVersion>
4+
<PackageVersion Condition="$(PackageVersion) == ''">8.1.0</PackageVersion>
55
</PropertyGroup>
66
</Project>

‎src/BVNetwork.404Handler.Cms8.csproj

+21-8
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<IISExpressUseClassicPipelineMode />
3838
<TargetFrameworkProfile />
3939
<UseGlobalApplicationHostFile />
40+
<RestorePackages>true</RestorePackages>
4041
</PropertyGroup>
4142
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4243
<OutputPath>bin\Debug\</OutputPath>
@@ -143,7 +144,9 @@
143144
<None Include="Views\NotFoundRedirect\Redirects.ascx">
144145
<SubType>ASPXCodeBehind</SubType>
145146
</None>
146-
<None Include="Views\NotFoundRedirect\Referers.ascx" />
147+
<None Include="Views\NotFoundRedirect\Referers.ascx">
148+
<SubType>ASPXCodeBehind</SubType>
149+
</None>
147150
<None Include="Views\NotFoundRedirect\Suggestions.ascx">
148151
<SubType>ASPXCodeBehind</SubType>
149152
</None>
@@ -340,11 +343,16 @@
340343
<ItemGroup>
341344
<Folder Include="Bvn\FileNotFound\Configuration\" />
342345
</ItemGroup>
346+
<PropertyGroup>
347+
<SolutionDir>$(ProjectDir)</SolutionDir>
348+
</PropertyGroup>
343349
<PropertyGroup>
344350
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
345351
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
346352
</PropertyGroup>
347-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
353+
<PropertyGroup>
354+
<RestorePackages>true</RestorePackages>
355+
</PropertyGroup>
348356
<PropertyGroup>
349357
<PreBuildEvent>
350358
</PreBuildEvent>
@@ -356,22 +364,27 @@
356364
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
357365
<!-- Used below, so define it first -->
358366
<PropertyGroup>
359-
<SolutionDir>$(ProjectDir)</SolutionDir>
367+
<ProjectDir Condition="'$(ProjectDir)' == ''">$(MSBuildProjectDirectory)</ProjectDir>
368+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(ProjectDir)</SolutionDir>
360369
<!-- NOTE! This is different between cms versions, the zip file needs to be named the same in the package -->
370+
<OutDir>$(OutputPath)</OutDir>
361371
<zipFile>$(OutDir)\BVNetwork.404Handler.zip</zipFile>
362372
</PropertyGroup>
373+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
363374
<!-- This holds the version of the package -->
364375
<Import Project="$(SolutionDir)\$(ProjectName).Version.targets" Condition="Exists('$(SolutionDir)\$(ProjectName).Version.targets')" />
376+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
377+
<Import Project="$(ProjectDir)\packageTools.targets" />
365378
<!-- Pack -->
366-
<Import Project="$(SolutionDir)\packageTools.targets" Condition="Exists('$(SolutionDir)\packageTools.targets')" />
367-
<Target Name="CreateNugetPackage" AfterTargets="Build" Condition="'$(Configuration)' == 'Release' ">
379+
<Target Name="CreateNugetPackage" AfterTargets="Build;Rebuild" Condition="'$(Configuration)' == 'Release' ">
380+
<Message Text="Creating Nuget Package"/>
368381
<!-- Create the Versioned out dir for the client resources-->
369382
<!-- Copy -->
370383
<ItemGroup>
371-
<ClientResources Include="$(SolutionDir)\ClientResources\**\*" />
372-
<Views Include="$(SolutionDir)\Views\**\*" />
384+
<ClientResources Include="$(ProjectDir)\ClientResources\**\*" />
385+
<Views Include="$(ProjectDir)\Views\**\*" />
373386
</ItemGroup>
374-
<Copy SourceFiles="$(SolutionDir)\module.config" DestinationFolder="$(TmpOutDir)\content" />
387+
<Copy SourceFiles="$(ProjectDir)\module.config" DestinationFolder="$(TmpOutDir)\content" />
375388
<Copy SourceFiles="@(ClientResources)" DestinationFiles="@(ClientResources -> '$(TmpOutDir)\content\ClientResources\%(RecursiveDir)%(Filename)%(Extension)')" />
376389
<Copy SourceFiles="@(Views)" DestinationFiles="@(Views -> '$(TmpOutDir)\content\Views\%(RecursiveDir)%(Filename)%(Extension)')" />
377390
<!-- Create the Zip file -->

‎src/BVNetwork.404Handler.Cms9.Version.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<PackageVersion Condition="$(PackageVersion) == ''">9.0.0</PackageVersion>
4+
<PackageVersion Condition="$(PackageVersion) == ''">9.1.0</PackageVersion>
55
</PropertyGroup>
66
</Project>

‎src/BVNetwork.404Handler.Cms9.csproj

+19-17
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@
115115
<EmbeddedResource Include="lang\bvnerrorhandlerEN.xml" />
116116
<EmbeddedResource Include="lang\bvnerrorhandlerNO.xml" />
117117
<EmbeddedResource Include="lang\bvnerrorhandlerSV.xml" />
118-
<EmbeddedResource Include="lang\RedirectsGadget.xml">
119-
<SubType>Designer</SubType>
120-
</EmbeddedResource>
118+
<EmbeddedResource Include="lang\RedirectsGadget.xml" />
121119
<None Include="ClientResources\Content\Images\BaseSprite.png" />
122120
<None Include="ClientResources\Content\Images\Gradients.png" />
123121
<None Include="ClientResources\Content\Images\gray_border.png" />
@@ -331,11 +329,16 @@
331329
<ItemGroup>
332330
<Folder Include="Bvn\FileNotFound\Configuration\" />
333331
</ItemGroup>
332+
<PropertyGroup>
333+
<SolutionDir>$(ProjectDir)</SolutionDir>
334+
</PropertyGroup>
334335
<PropertyGroup>
335336
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
336337
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
337338
</PropertyGroup>
338-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
339+
<PropertyGroup>
340+
<RestorePackages>true</RestorePackages>
341+
</PropertyGroup>
339342
<PropertyGroup>
340343
<PreBuildEvent>
341344
</PreBuildEvent>
@@ -345,24 +348,30 @@
345348
<ProjectExtensions />
346349
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
347350
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
351+
348352
<!-- Used below, so define it first -->
349353
<PropertyGroup>
350-
<SolutionDir>$(ProjectDir)</SolutionDir>
354+
<ProjectDir Condition="'$(ProjectDir)' == ''">$(MSBuildProjectDirectory)</ProjectDir>
355+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(ProjectDir)</SolutionDir>
351356
<!-- NOTE! This is different between cms versions, the zip file needs to be named the same in the package -->
357+
<OutDir>$(OutputPath)</OutDir>
352358
<zipFile>$(OutDir)\BVNetwork.404Handler.zip</zipFile>
353359
</PropertyGroup>
360+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
354361
<!-- This holds the version of the package -->
355362
<Import Project="$(SolutionDir)\$(ProjectName).Version.targets" Condition="Exists('$(SolutionDir)\$(ProjectName).Version.targets')" />
363+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
364+
<Import Project="$(ProjectDir)\packageTools.targets" />
356365
<!-- Pack -->
357-
<Import Project="$(SolutionDir)\packageTools.targets" Condition="Exists('$(SolutionDir)\packageTools.targets')" />
358-
<Target Name="CreateNugetPackage" AfterTargets="Build" Condition="'$(Configuration)' == 'Release' ">
366+
<Target Name="CreateNugetPackage" AfterTargets="Build;Rebuild" Condition="'$(Configuration)' == 'Release' ">
367+
<Message Text="Creating Nuget Package"/>
359368
<!-- Create the Versioned out dir for the client resources-->
360369
<!-- Copy -->
361370
<ItemGroup>
362-
<ClientResources Include="$(SolutionDir)\ClientResources\**\*" />
363-
<Views Include="$(SolutionDir)\Views\**\*" />
371+
<ClientResources Include="$(ProjectDir)\ClientResources\**\*" />
372+
<Views Include="$(ProjectDir)\Views\**\*" />
364373
</ItemGroup>
365-
<Copy SourceFiles="$(SolutionDir)\module.config" DestinationFolder="$(TmpOutDir)\content" />
374+
<Copy SourceFiles="$(ProjectDir)\module.config" DestinationFolder="$(TmpOutDir)\content" />
366375
<Copy SourceFiles="@(ClientResources)" DestinationFiles="@(ClientResources -> '$(TmpOutDir)\content\ClientResources\%(RecursiveDir)%(Filename)%(Extension)')" />
367376
<Copy SourceFiles="@(Views)" DestinationFiles="@(Views -> '$(TmpOutDir)\content\Views\%(RecursiveDir)%(Filename)%(Extension)')" />
368377
<!-- Create the Zip file -->
@@ -373,11 +382,4 @@
373382
<RemoveDir Directories="$(TmpOutDir)" />
374383
<Delete Files="$(zipFile)" />
375384
</Target>
376-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
377-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
378-
<PropertyGroup>
379-
<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>
380-
</PropertyGroup>
381-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
382-
</Target>
383385
</Project>

‎src/BVNetwork.404Handler.Version.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<PackageVersion Condition="$(PackageVersion) == ''">10.0.0</PackageVersion>
4+
<PackageVersion Condition="$(PackageVersion) == ''">10.1.0</PackageVersion>
55
</PropertyGroup>
66
</Project>

‎src/BVNetwork.404Handler.csproj

+21-8
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<IISExpressUseClassicPipelineMode />
3838
<TargetFrameworkProfile />
3939
<UseGlobalApplicationHostFile />
40+
<RestorePackages>true</RestorePackages>
4041
</PropertyGroup>
4142
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4243
<OutputPath>bin\Debug\</OutputPath>
@@ -142,7 +143,9 @@
142143
<None Include="Views\NotFoundRedirect\Redirects.ascx">
143144
<SubType>ASPXCodeBehind</SubType>
144145
</None>
145-
<None Include="Views\NotFoundRedirect\Referers.ascx" />
146+
<None Include="Views\NotFoundRedirect\Referers.ascx">
147+
<SubType>ASPXCodeBehind</SubType>
148+
</None>
146149
<None Include="Views\NotFoundRedirect\Suggestions.ascx">
147150
<SubType>ASPXCodeBehind</SubType>
148151
</None>
@@ -326,11 +329,16 @@
326329
<ItemGroup>
327330
<Folder Include="Bvn\FileNotFound\Configuration\" />
328331
</ItemGroup>
332+
<PropertyGroup>
333+
<SolutionDir>$(ProjectDir)</SolutionDir>
334+
</PropertyGroup>
329335
<PropertyGroup>
330336
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
331337
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
332338
</PropertyGroup>
333-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
339+
<PropertyGroup>
340+
<RestorePackages>true</RestorePackages>
341+
</PropertyGroup>
334342
<PropertyGroup>
335343
<PreBuildEvent>
336344
</PreBuildEvent>
@@ -342,22 +350,27 @@
342350
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
343351
<!-- Used below, so define it first -->
344352
<PropertyGroup>
345-
<SolutionDir>$(ProjectDir)</SolutionDir>
353+
<ProjectDir Condition="'$(ProjectDir)' == ''">$(MSBuildProjectDirectory)</ProjectDir>
354+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(ProjectDir)</SolutionDir>
346355
<!-- NOTE! This is different between cms versions, the zip file needs to be named the same in the package -->
356+
<OutDir>$(OutputPath)</OutDir>
347357
<zipFile>$(OutDir)\BVNetwork.404Handler.zip</zipFile>
348358
</PropertyGroup>
359+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
349360
<!-- This holds the version of the package -->
350361
<Import Project="$(SolutionDir)\$(ProjectName).Version.targets" Condition="Exists('$(SolutionDir)\$(ProjectName).Version.targets')" />
362+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
363+
<Import Project="$(ProjectDir)\packageTools.targets" />
351364
<!-- Pack -->
352-
<Import Project="$(SolutionDir)\packageTools.targets" Condition="Exists('$(SolutionDir)\packageTools.targets')" />
353-
<Target Name="CreateNugetPackage" AfterTargets="Build" Condition="'$(Configuration)' == 'Release' ">
365+
<Target Name="CreateNugetPackage" AfterTargets="Build;Rebuild" Condition="'$(Configuration)' == 'Release' ">
366+
<Message Text="Creating Nuget Package"/>
354367
<!-- Create the Versioned out dir for the client resources-->
355368
<!-- Copy -->
356369
<ItemGroup>
357-
<ClientResources Include="$(SolutionDir)\ClientResources\**\*" />
358-
<Views Include="$(SolutionDir)\Views\**\*" />
370+
<ClientResources Include="$(ProjectDir)\ClientResources\**\*" />
371+
<Views Include="$(ProjectDir)\Views\**\*" />
359372
</ItemGroup>
360-
<Copy SourceFiles="$(SolutionDir)\module.config" DestinationFolder="$(TmpOutDir)\content" />
373+
<Copy SourceFiles="$(ProjectDir)\module.config" DestinationFolder="$(TmpOutDir)\content" />
361374
<Copy SourceFiles="@(ClientResources)" DestinationFiles="@(ClientResources -> '$(TmpOutDir)\content\ClientResources\%(RecursiveDir)%(Filename)%(Extension)')" />
362375
<Copy SourceFiles="@(Views)" DestinationFiles="@(Views -> '$(TmpOutDir)\content\Views\%(RecursiveDir)%(Filename)%(Extension)')" />
363376
<!-- Create the Zip file -->

‎src/build-packages.cmd

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
del *.nupkg
3+
msbuild BVNetwork.404Handler.Cms8.csproj /t:Rebuild /p:Configuration=Release /v:m
4+
5+
msbuild BVNetwork.404Handler.Cms9.csproj /t:Rebuild /p:Configuration=Release /v:m
6+
7+
msbuild BVNetwork.404Handler.csproj /t:Rebuild /p:Configuration=Release /v:m

0 commit comments

Comments
 (0)