Restructured the projects

hmlendea · Aug 27, 2019 · ad2e9ec · ad2e9ec
1 parent 0e8a38b
commit ad2e9ec
Show file tree

Hide file tree

Showing 39 changed files with 8 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-*/[Cc]ache/*
+[Cc]ache/*
 *.m3u
 
 ## Ignore Visual Studio temporary files, build results, and

diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,8 @@ dist: xenial
 
 install:
   - dotnet restore
-  - dotnet test IptvPlaylistAggregator.UnitTests
+  - dotnet restore UnitTests
+  - dotnet test UnitTests
 
 script:
   - dotnet build
diff --git a/...ggregator/Communication/FileDownloader.cs → Communication/FileDownloader.cs b/...ggregator/Communication/FileDownloader.cs → Communication/FileDownloader.cs
diff --git a/...gregator/Communication/IFileDownloader.cs → Communication/IFileDownloader.cs b/...gregator/Communication/IFileDownloader.cs → Communication/IFileDownloader.cs
diff --git a/...ator/Configuration/ApplicationSettings.cs → Configuration/ApplicationSettings.cs b/...ator/Configuration/ApplicationSettings.cs → Configuration/ApplicationSettings.cs
diff --git a/...Aggregator/Configuration/CacheSettings.cs → Configuration/CacheSettings.cs b/...Aggregator/Configuration/CacheSettings.cs → Configuration/CacheSettings.cs
diff --git a/...egator/Configuration/DataStoreSettings.cs → Configuration/DataStoreSettings.cs b/...egator/Configuration/DataStoreSettings.cs → Configuration/DataStoreSettings.cs
diff --git a/IptvPlaylistAggregator/Data/channels.xml → Data/channels.xml b/IptvPlaylistAggregator/Data/channels.xml → Data/channels.xml
diff --git a/IptvPlaylistAggregator/Data/groups.xml → Data/groups.xml b/IptvPlaylistAggregator/Data/groups.xml → Data/groups.xml
diff --git a/IptvPlaylistAggregator/Data/providers.xml → Data/providers.xml b/IptvPlaylistAggregator/Data/providers.xml → Data/providers.xml
diff --git a/...ss/DataObjects/ChannelDefinitionEntity.cs → ...ss/DataObjects/ChannelDefinitionEntity.cs b/...ss/DataObjects/ChannelDefinitionEntity.cs → ...ss/DataObjects/ChannelDefinitionEntity.cs
diff --git a/...tor/DataAccess/DataObjects/GroupEntity.cs → DataAccess/DataObjects/GroupEntity.cs b/...tor/DataAccess/DataObjects/GroupEntity.cs → DataAccess/DataObjects/GroupEntity.cs
diff --git a/...ess/DataObjects/PlaylistProviderEntity.cs → ...ess/DataObjects/PlaylistProviderEntity.cs b/...ess/DataObjects/PlaylistProviderEntity.cs → ...ess/DataObjects/PlaylistProviderEntity.cs
diff --git a/...tAggregator/IptvPlaylistAggregator.csproj → IptvPlaylistAggregator.csproj b/...tAggregator/IptvPlaylistAggregator.csproj → IptvPlaylistAggregator.csproj
@@ -12,6 +12,10 @@
     <None Update="Data/providers.xml"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="UnitTests/**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />

diff --git a/IptvPlaylistAggregator.sln b/IptvPlaylistAggregator.sln
diff --git a/...laylistAggregator/Logging/MyLogInfoKey.cs → Logging/MyLogInfoKey.cs b/...laylistAggregator/Logging/MyLogInfoKey.cs → Logging/MyLogInfoKey.cs
diff --git a/...PlaylistAggregator/Logging/MyOperation.cs → Logging/MyOperation.cs b/...PlaylistAggregator/Logging/MyOperation.cs → Logging/MyOperation.cs
diff --git a/IptvPlaylistAggregator/Program.cs → Program.cs b/IptvPlaylistAggregator/Program.cs → Program.cs
diff --git a/...Aggregator/Service/IMediaSourceChecker.cs → Service/IMediaSourceChecker.cs b/...Aggregator/Service/IMediaSourceChecker.cs → Service/IMediaSourceChecker.cs
diff --git a/...Aggregator/Service/IPlaylistAggregator.cs → Service/IPlaylistAggregator.cs b/...Aggregator/Service/IPlaylistAggregator.cs → Service/IPlaylistAggregator.cs
diff --git a/...istAggregator/Service/IPlaylistFetcher.cs → Service/IPlaylistFetcher.cs b/...istAggregator/Service/IPlaylistFetcher.cs → Service/IPlaylistFetcher.cs
diff --git a/...ggregator/Service/IPlaylistFileBuilder.cs → Service/IPlaylistFileBuilder.cs b/...ggregator/Service/IPlaylistFileBuilder.cs → Service/IPlaylistFileBuilder.cs
diff --git a/...rvice/Mapping/ChannelDefinitionMapping.cs → Service/Mapping/ChannelDefinitionMapping.cs b/...rvice/Mapping/ChannelDefinitionMapping.cs → Service/Mapping/ChannelDefinitionMapping.cs
diff --git a/...ggregator/Service/Mapping/GroupMapping.cs → Service/Mapping/GroupMapping.cs b/...ggregator/Service/Mapping/GroupMapping.cs → Service/Mapping/GroupMapping.cs
diff --git a/...ervice/Mapping/PlaylistProviderMapping.cs → Service/Mapping/PlaylistProviderMapping.cs b/...ervice/Mapping/PlaylistProviderMapping.cs → Service/Mapping/PlaylistProviderMapping.cs
diff --git a/...tAggregator/Service/MediaSourceChecker.cs → Service/MediaSourceChecker.cs b/...tAggregator/Service/MediaSourceChecker.cs → Service/MediaSourceChecker.cs
diff --git a/...ylistAggregator/Service/Models/Channel.cs → Service/Models/Channel.cs b/...ylistAggregator/Service/Models/Channel.cs → Service/Models/Channel.cs
diff --git a/...gator/Service/Models/ChannelDefinition.cs → Service/Models/ChannelDefinition.cs b/...gator/Service/Models/ChannelDefinition.cs → Service/Models/ChannelDefinition.cs
diff --git a/...tAggregator/Service/Models/ChannelName.cs → Service/Models/ChannelName.cs b/...tAggregator/Service/Models/ChannelName.cs → Service/Models/ChannelName.cs
diff --git a/...laylistAggregator/Service/Models/Group.cs → Service/Models/Group.cs b/...laylistAggregator/Service/Models/Group.cs → Service/Models/Group.cs
diff --git a/...gator/Service/Models/MediaStreamStatus.cs → Service/Models/MediaStreamStatus.cs b/...gator/Service/Models/MediaStreamStatus.cs → Service/Models/MediaStreamStatus.cs
diff --git a/...listAggregator/Service/Models/Playlist.cs → Service/Models/Playlist.cs b/...listAggregator/Service/Models/Playlist.cs → Service/Models/Playlist.cs
diff --git a/...egator/Service/Models/PlaylistProvider.cs → Service/Models/PlaylistProvider.cs b/...egator/Service/Models/PlaylistProvider.cs → Service/Models/PlaylistProvider.cs
diff --git a/...tAggregator/Service/PlaylistAggregator.cs → Service/PlaylistAggregator.cs b/...tAggregator/Service/PlaylistAggregator.cs → Service/PlaylistAggregator.cs
diff --git a/...listAggregator/Service/PlaylistFetcher.cs → Service/PlaylistFetcher.cs b/...listAggregator/Service/PlaylistFetcher.cs → Service/PlaylistFetcher.cs
diff --git a/...Aggregator/Service/PlaylistFileBuilder.cs → Service/PlaylistFileBuilder.cs b/...Aggregator/Service/PlaylistFileBuilder.cs → Service/PlaylistFileBuilder.cs
diff --git a/...s/IptvPlaylistAggregator.UnitTests.csproj → ...s/IptvPlaylistAggregator.UnitTests.csproj b/...s/IptvPlaylistAggregator.UnitTests.csproj → ...s/IptvPlaylistAggregator.UnitTests.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\IptvPlaylistAggregator\IptvPlaylistAggregator.csproj" />
+    <ProjectReference Include="..\IptvPlaylistAggregator.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/.../Tests/Service/Models/ChannelNameTests.cs → UnitTests/Service/Models/ChannelNameTests.cs b/.../Tests/Service/Models/ChannelNameTests.cs → UnitTests/Service/Models/ChannelNameTests.cs
diff --git a/IptvPlaylistAggregator/appsettings.json → appsettings.json b/IptvPlaylistAggregator/appsettings.json → appsettings.json