ready to pack 1.0.0

Signed-off-by: Emmanuel Mathot <emmanuel.mahot@gmail.com>
Terradue · Oct 9, 2014 · c305a1c · c305a1c
1 parent bce0ea0
commit c305a1c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Terradue.OpenSearch"]
-	path = Terradue.OpenSearch
-	url = git@github.com:Terradue/DotNetOpenSearch.git

diff --git a/Terradue.OpenSearch b/Terradue.OpenSearch
diff --git a/Terradue.OpenSearch.GeoJson.nuspec b/Terradue.OpenSearch.GeoJson.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Terradue.OpenSearch.GeoJson</id>
-    <version>1.0.0-beta</version>
+    <version>1.0.0</version>
     <title>Terradue.OpenSearch.GeoJson</title>
     <authors>Terradue</authors>
     <projectUrl>https://github.com/Terradue/DotNetOpenSearchGeoJson</projectUrl>
@@ -11,9 +11,10 @@
     <description>Terradue.OpenSearch.GeoJson is a library targeting .NET 4.0 and above that provides an extension to Terradue.OpenSearch to query from a class or an URL from/to GeoJson format</description>
     <summary>GeoJson OpenSearch extension library for .Net</summary>
     <dependencies>
-      <dependency id="Terradue.ServiceModel.Syndication" version="1.0.0" />
-      <dependency id="Terradue.OpenSearch" version="1.6.0" />
-      <dependency id="Terradue.GeoJson" version="1.3.2" />
+      <dependency id="Terradue.ServiceModel.Syndication" version="[1.0.0]" />
+      <dependency id="Terradue.OpenSearch" version="[1.7.0,1.8.0)" />
+      <dependency id="Terradue.GeoJson" version="[1.4.0,1.5)" />
+      <dependency id="ServiceStack.Text" version="[3.9.71,4)" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Terradue.OpenSearch.GeoJson.sln b/Terradue.OpenSearch.GeoJson.sln
@@ -3,18 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terradue.OpenSearch.GeoJson", "Terradue.OpenSearch.GeoJson\Terradue.OpenSearch.GeoJson.csproj", "{B932B7CD-4DDA-4084-AFBC-0FFCF4310C2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terradue.OpenSearch", "Terradue.OpenSearch\Terradue.OpenSearch\Terradue.OpenSearch.csproj", "{997A44FD-EE4A-490A-855B-88305E0CD269}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B932B7CD-4DDA-4084-AFBC-0FFCF4310C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B932B7CD-4DDA-4084-AFBC-0FFCF4310C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B932B7CD-4DDA-4084-AFBC-0FFCF4310C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Terradue.OpenSearch.GeoJson/Properties/AssemblyInfo.cs b/Terradue.OpenSearch.GeoJson/Properties/AssemblyInfo.cs
@@ -14,7 +14,8 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.*")]
+[assembly: AssemblyInformationalVersion("1.0.0")]
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
 //[assembly: AssemblyDelaySign(false)]

diff --git a/Terradue.OpenSearch.GeoJson/Terradue.OpenSearch.GeoJson.csproj b/Terradue.OpenSearch.GeoJson/Terradue.OpenSearch.GeoJson.csproj
@@ -54,12 +54,14 @@
     <Reference Include="Terradue.ServiceModel.Syndication">
       <HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.0.0\lib\net40\Terradue.ServiceModel.Syndication.dll</HintPath>
     </Reference>
+    <Reference Include="Terradue.OpenSearch">
+      <HintPath>..\packages\Terradue.OpenSearch.1.7.0.1\lib\net40\Terradue.OpenSearch.dll</HintPath>
+    </Reference>
     <Reference Include="Terradue.GeoJson">
-      <HintPath>..\packages\Terradue.GeoJson.1.3.2.0\lib\net40\Terradue.GeoJson.dll</HintPath>
+      <HintPath>..\packages\Terradue.GeoJson.1.4.0\lib\net40\Terradue.GeoJson.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks" />
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Terradue\OpenSearch\GeoJson\Extensions\FeatureCollectionOpenSearchEngineExtension.cs" />
@@ -74,10 +76,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildProjectDirectory)\..\.nuget\NuGet.targets" Condition="Exists('$(MSBuildProjectDirectory)\..\.nuget\NuGet.targets')" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\Terradue.OpenSearch\Terradue.OpenSearch\Terradue.OpenSearch.csproj">
-      <Project>{997A44FD-EE4A-490A-855B-88305E0CD269}</Project>
-      <Name>Terradue.OpenSearch</Name>
-    </ProjectReference>
-  </ItemGroup>
 </Project>
diff --git a/Terradue.OpenSearch.GeoJson/packages.config b/Terradue.OpenSearch.GeoJson/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ServiceStack.Text" version="3.9.71" targetFramework="net35" />
-  <package id="Terradue.GeoJson" version="1.3.2.0" targetFramework="net40" />
+  <package id="Terradue.GeoJson" version="1.4.0" targetFramework="net40" />
+  <package id="Terradue.OpenSearch" version="1.7.0.1" targetFramework="net40" />
   <package id="Terradue.ServiceModel.Syndication" version="1.0.0.0" targetFramework="net40" />
 </packages>