Skip to content

Commit 5b38908

Browse files
authored
Merge pull request #8 from Ignia/develop
3.8.1 (Patch): Return 301 for Nested Topics
2 parents 54f0095 + 77aa7ff commit 5b38908

29 files changed

Lines changed: 69 additions & 83 deletions

Ignia.Topics.Data.Caching/Ignia.Topics.Data.Caching.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@
4848
<TargetFrameworkProfile />
4949
<ShouldCreateLogs>True</ShouldCreateLogs>
5050
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
51-
<UpdateAssemblyVersion>True</UpdateAssemblyVersion>
52-
<UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
53-
<UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
54-
<AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
55-
<UpdatePackageVersion>False</UpdatePackageVersion>
56-
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
57-
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
58-
<AssemblyFileVersionSettings>None.None.Increment.None</AssemblyFileVersionSettings>
5951
</PropertyGroup>
6052
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
6153
<DebugSymbols>true</DebugSymbols>
@@ -158,8 +150,10 @@
158150
</PropertyGroup>
159151
<Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props'))" />
160152
<Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets'))" />
153+
<Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
161154
</Target>
162155
<Import Project="..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets" Condition="Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" />
156+
<Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
163157
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
164158
Other similar extension points exist, see Microsoft.Common.targets.
165159
<Target Name="BeforeBuild">

Ignia.Topics.Data.Caching/Ignia.Topics.Data.Caching.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>$version$</version>
5+
<version>$SemVer$</version>
66
<title>$title$</title>
7-
<authors>Ignia</authors>
7+
<authors>$author$</authors>
88
<owners>JeremyCaney</owners>
99
<projectUrl>https://github.com/Ignia/Topics-Library</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>

Ignia.Topics.Data.Caching/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
>===============================================================================================================================
1313
| Declare and define attributes used in the compiling of the finished assembly.
1414
\-----------------------------------------------------------------------------------------------------------------------------*/
15-
[assembly: AssemblyCompany("Ignia, LLC")]
15+
[assembly: AssemblyCompany("Ignia")]
1616
[assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
1717
[assembly: AssemblyProduct("Ignia OnTopic Library")]
1818
[assembly: AssemblyTitle("OnTopic Cached Repository")]
@@ -21,8 +21,6 @@
2121
[assembly: AssemblyTrademark("")]
2222
[assembly: AssemblyCulture("")]
2323
[assembly: ComVisible(false)]
24-
[assembly: AssemblyVersion("3.6.1762.0")]
25-
[assembly: AssemblyFileVersion("3.5.1794.0")]
2624
[assembly: CLSCompliant(true)]
2725
[assembly: Guid("206b7f91-ca25-4e9d-9576-60d2e54a2c0a")]
2826

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CodeContracts.MSBuild" version="1.12.0" targetFramework="net45" developmentDependency="true" />
4+
<package id="GitVersionTask" version="3.6.5" targetFramework="net47" developmentDependency="true" />
45
</packages>

Ignia.Topics.Data.Sql/Ignia.Topics.Data.Sql.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@
208208
</PropertyGroup>
209209
<Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props'))" />
210210
<Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets'))" />
211+
<Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
211212
</Target>
212213
<Import Project="..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets" Condition="Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" />
214+
<Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
213215
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
214216
Other similar extension points exist, see Microsoft.Common.targets.
215217
<Target Name="BeforeBuild">

Ignia.Topics.Data.Sql/Ignia.Topics.Data.Sql.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>$version$</version>
5+
<version>$SemVer$</version>
66
<title>$title$</title>
7-
<authors>Ignia</authors>
7+
<authors>$author$</authors>
88
<owners>JeremyCaney</owners>
99
<projectUrl>https://github.com/Ignia/Topics-Library</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>

Ignia.Topics.Data.Sql/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
>===============================================================================================================================
1313
| Declare and define attributes used in the compiling of the finished assembly.
1414
\-----------------------------------------------------------------------------------------------------------------------------*/
15-
[assembly: AssemblyCompany("Ignia, LLC")]
15+
[assembly: AssemblyCompany("Ignia")]
1616
[assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
1717
[assembly: AssemblyProduct("Ignia OnTopic Library")]
1818
[assembly: AssemblyTitle("Ignia SQL Server Repository")]
@@ -21,7 +21,5 @@
2121
[assembly: AssemblyTrademark("")]
2222
[assembly: AssemblyCulture("")]
2323
[assembly: ComVisible(false)]
24-
[assembly: AssemblyVersion("3.6.1739.0")]
25-
[assembly: AssemblyFileVersion("3.5.1763.0")]
2624
[assembly: CLSCompliant(true)]
2725
[assembly: Guid("1de1f923-c7c2-435b-b49a-975acbcb5ff0")]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CodeContracts.MSBuild" version="1.12.0" targetFramework="net45" developmentDependency="true" />
4+
<package id="GitVersionTask" version="3.6.5" targetFramework="net47" developmentDependency="true" />
45
</packages>

Ignia.Topics.Tests/Ignia.Topics.Tests.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@
2222
<TargetFrameworkProfile />
2323
<ShouldCreateLogs>True</ShouldCreateLogs>
2424
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
25-
<UpdateAssemblyVersion>True</UpdateAssemblyVersion>
26-
<UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
27-
<UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
28-
<AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
29-
<UpdatePackageVersion>False</UpdatePackageVersion>
30-
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
31-
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
32-
<AssemblyFileVersionSettings>None.None.Increment.None</AssemblyFileVersionSettings>
3325
</PropertyGroup>
3426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3527
<DebugSymbols>true</DebugSymbols>

Ignia.Topics.Tests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
>===============================================================================================================================
1313
| Declare and define attributes used in the compiling of the finished assembly.
1414
\-----------------------------------------------------------------------------------------------------------------------------*/
15-
[assembly: AssemblyCompany("Ignia, LLC")]
15+
[assembly: AssemblyCompany("Ignia")]
1616
[assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
1717
[assembly: AssemblyProduct("Ignia OnTopic Library")]
1818
[assembly: AssemblyTitle("Ignia OnTopic Unit Tests")]
@@ -21,7 +21,5 @@
2121
[assembly: AssemblyTrademark("")]
2222
[assembly: AssemblyCulture("")]
2323
[assembly: ComVisible(false)]
24-
[assembly: AssemblyVersion("3.6.1791.0")]
25-
[assembly: AssemblyFileVersion("3.5.1839.0")]
2624
[assembly: CLSCompliant(true)]
2725
[assembly: Guid("27632801-bfe3-41d9-8678-3c4bbe45e6c9")]

0 commit comments

Comments
 (0)