Skip to content

Commit fa76ed3

Browse files
committed
Fixed build scripts
1 parent c6d2dea commit fa76ed3

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

Dnn.WebAnalytics.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<UseGlobalApplicationHostFile />
2525
<Use64BitIISExpress />
2626
<TargetFrameworkProfile />
27+
<NuGetPackageImportStamp>
28+
</NuGetPackageImportStamp>
2729
</PropertyGroup>
2830
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2931
<DebugSymbols>true</DebugSymbols>
@@ -190,6 +192,7 @@
190192
</ItemGroup>
191193
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
192194
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets" />
195+
<Import Project="$(MSBuildProjectDirectory)\msbuild\Project.targets" />
193196
<ProjectExtensions>
194197
<VisualStudio>
195198
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -199,6 +202,13 @@
199202
</FlavorProperties>
200203
</VisualStudio>
201204
</ProjectExtensions>
205+
<Import Project="packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
206+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
207+
<PropertyGroup>
208+
<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>
209+
</PropertyGroup>
210+
<Error Condition="!Exists('packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
211+
</Target>
202212
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
203213
Other similar extension points exist, see Microsoft.Common.targets.
204214
<Target Name="BeforeBuild">
Binary file not shown.

msbuild/Project.targets

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Target Name="BeforeBuild" Condition="'$(ConfigurationName)'=='Release'">
2323
<CallTarget Targets="SetVersionInfo" />
2424
</Target>
25-
<Target Name="AfterBuild">
25+
<Target Name="AfterBuild" Condition="'$(ConfigurationName)'=='Release'">
2626
<CallTarget Targets="DeployFiles" />
2727
</Target>
2828

@@ -43,7 +43,6 @@
4343

4444
<CallTarget Targets="RemoveZips" Condition="'$(ConfigurationName)'=='Release'" />
4545
<CallTarget Targets="ZipInstall" Condition="'$(ConfigurationName)'=='Release'" />
46-
<CallTarget Targets="CopyFilesToDotNetNuke" Condition="'$(DotNetNukeDir)'!=''" />
4746

4847
</Target>
4948

@@ -110,15 +109,6 @@
110109
<!-- cleanup -->
111110
<Delete Files="$(MSBuildProjectDirectory)\resources.zip"></Delete>
112111
</Target>
113-
<Target Name="CopyFilesToDotNetNuke">
114-
<!-- Copy assemblies and Debug Info to DNN Bin Dir -->
115-
<Message Text="MSBUILD: copying @(Assemblies) to $(DotNetNukeDir)\bin\" Importance="high"></Message>
116-
<CreateItem Include="$(BinDir)\*.pdb;$(BinDir)\*.dll;">
117-
<Output TaskParameter="Include" ItemName="Assemblies" />
118-
</CreateItem>
119-
<Copy SourceFiles="@(Assemblies)" DestinationFolder="$(DotNetNukeDir)\bin\" SkipUnchangedFiles="false" ContinueOnError="true" />
120-
<Message Text="MSBUILD: Copied @(Assemblies) to $(DotNetNukeDir)\bin\" Importance="high"></Message>
121-
</Target>
122112
</Project>
123113

124114

packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<package id="MaxMind.Db" version="2.4.0" targetFramework="net472" />
99
<package id="MaxMind.GeoIP2" version="3.0.0" targetFramework="net472" />
1010
<package id="Microsoft.CSharp" version="4.4.1" targetFramework="net472" />
11+
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net472" developmentDependency="true" />
1112
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net472" />
1213
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net472" />
1314
</packages>

0 commit comments

Comments
 (0)