[mapguide-commits] r8281 - in branches/2.6/MgDev/nuget/MapGuideNuget: .nuget CoordSysEnumTest CoordSysEnumTest64 DesktopConsoleTest DesktopConsoleTest64 DesktopViewerTest DesktopViewerTest64 MapGuideNuget MapGuideNuget64
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 4 04:36:55 PDT 2014
Author: jng
Date: 2014-07-04 04:36:55 -0700 (Fri, 04 Jul 2014)
New Revision: 8281
Removed:
branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config
branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config
Modified:
branches/2.6/MgDev/nuget/MapGuideNuget/.nuget/NuGet.exe
branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj
branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj
Log:
Update nuget test solution. The solution and its projects should be in a clean slate.
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/.nuget/NuGet.exe
===================================================================
(Binary files differ)
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/CoordSysEnumTest.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -35,15 +37,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -76,7 +69,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -90,10 +82,15 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <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>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/CoordSysEnumTest.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -36,15 +36,6 @@
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -77,7 +68,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -91,9 +81,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/DesktopConsoleTest.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -34,22 +36,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
@@ -64,17 +50,18 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <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>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x86" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/DesktopConsoleTest.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -35,18 +35,6 @@
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\packages\mg-desktop-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
@@ -61,16 +49,10 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x64.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x64" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/DesktopViewerTest.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -34,30 +36,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=AMD64">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-viewer-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=2.4.0.7093, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\mg-desktop-viewer-net40-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -90,7 +68,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -104,11 +81,15 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x86.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <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>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x86" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-viewer-net40-x86" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/DesktopViewerTest.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -35,24 +35,6 @@
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop">
- <HintPath>..\packages\mg-desktop-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer">
- <HintPath>..\packages\mg-desktop-viewer-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Viewer.Desktop">
- <HintPath>..\packages\mg-desktop-viewer-net40-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -82,7 +64,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -96,10 +77,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
-if not exist "$(TargetDir)Dictionaries" md "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\cs-map-dictionaries.2.4.0.7093\dictionaries\*.*" "$(TargetDir)Dictionaries"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mg-desktop-net40-x64.2.4.0.7093\mg-desktop\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="cs-map-dictionaries" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-net40-x64" version="2.4.0.7093" targetFramework="net40-Client" />
- <package id="mg-desktop-viewer-net40-x64" version="2.4.0.7093" targetFramework="net40-Client" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/MapGuideNuget.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -19,24 +19,11 @@
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.MapGuideCommon">
- <HintPath>..\packages\mapguide-api-web-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.MapGuideCommon.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Web">
- <HintPath>..\packages\mapguide-api-web-x86.2.4.0.7093\lib\net40\OSGeo.MapGuide.Web.dll</HintPath>
- </Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
@@ -73,7 +60,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -127,9 +113,15 @@
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x86.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-web-x86.2.4.0.7093\mapguide-api-web\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <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>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="mapguide-api-base-x86" version="2.4.0.7093" targetFramework="net40" />
- <package id="mapguide-api-web-x86" version="2.4.0.7093" targetFramework="net40" />
-</packages>
\ No newline at end of file
Modified: branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/MapGuideNuget.csproj 2014-07-04 11:36:55 UTC (rev 8281)
@@ -24,21 +24,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="OSGeo.MapGuide.Foundation">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Foundation.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Geometry">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Geometry.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.MapGuideCommon">
- <HintPath>..\packages\mapguide-api-web-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.MapGuideCommon.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.PlatformBase">
- <HintPath>..\packages\mapguide-api-base-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.PlatformBase.dll</HintPath>
- </Reference>
- <Reference Include="OSGeo.MapGuide.Web">
- <HintPath>..\packages\mapguide-api-web-x64.2.4.0.7093\lib\net40\OSGeo.MapGuide.Web.dll</HintPath>
- </Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
@@ -75,7 +60,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="packages.config" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -129,8 +113,7 @@
</ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-base-x64.2.4.0.7093\mapguide-api-base\*.*" "$(TargetDir)"
-xcopy /s /y "$(SolutionDir)packages\mapguide-api-web-x64.2.4.0.7093\mapguide-api-web\*.*" "$(TargetDir)"</PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Deleted: branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config
===================================================================
--- branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config 2014-07-04 10:14:44 UTC (rev 8280)
+++ branches/2.6/MgDev/nuget/MapGuideNuget/MapGuideNuget64/packages.config 2014-07-04 11:36:55 UTC (rev 8281)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="mapguide-api-base-x64" version="2.4.0.7093" targetFramework="net40" />
- <package id="mapguide-api-web-x64" version="2.4.0.7093" targetFramework="net40" />
-</packages>
\ No newline at end of file
More information about the mapguide-commits
mailing list