diff options
18 files changed, 574 insertions, 749 deletions
diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj index d07d4ce2b..8e1c7e71a 100644 --- a/BDInfo/BDInfo.csproj +++ b/BDInfo/BDInfo.csproj @@ -62,11 +62,6 @@ <Compile Include="TSStreamFile.cs" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent>if $(ConfigurationName) == Release ( -xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i -)</PostBuildEvent> - </PropertyGroup> <!-- 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"> diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj index 8545e8d98..ba63e77f0 100644 --- a/DvdLib/DvdLib.csproj +++ b/DvdLib/DvdLib.csproj @@ -61,11 +61,6 @@ </ProjectReference> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent>if $(ConfigurationName) == Release ( -xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i -)</PostBuildEvent> - </PropertyGroup> <!-- 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"> diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 0639a6bb7..3b1499419 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -1,6 +1,5 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Events; -using MediaBrowser.Common.Implementations.Archiving; using MediaBrowser.Common.Implementations.Devices; using MediaBrowser.Common.Implementations.IO; using MediaBrowser.Common.Implementations.ScheduledTasks; @@ -158,12 +157,6 @@ namespace MediaBrowser.Common.Implementations protected IFileSystem FileSystemManager { get; private set; } - /// <summary> - /// Gets or sets the zip client. - /// </summary> - /// <value>The zip client.</value> - protected IZipClient ZipClient { get; private set; } - protected IIsoManager IsoManager { get; private set; } /// <summary> @@ -243,14 +236,7 @@ namespace MediaBrowser.Common.Implementations JsonSerializer = CreateJsonSerializer(); - if (Environment.OSVersion.Platform == PlatformID.Win32NT) - { - MemoryStreamProvider = new RecyclableMemoryStreamProvider(); - } - else - { - MemoryStreamProvider = new MemoryStreamProvider(); - } + MemoryStreamProvider = CreateMemoryStreamProvider(); OnLoggerLoaded(true); LogManager.LoggerLoaded += (s, e) => OnLoggerLoaded(false); @@ -283,6 +269,8 @@ namespace MediaBrowser.Common.Implementations progress.Report(100); } + protected abstract IMemoryStreamProvider CreateMemoryStreamProvider(); + protected virtual void OnLoggerLoaded(bool isFirstLoad) { Logger.Info("Application version: {0}", ApplicationVersion); @@ -531,9 +519,6 @@ namespace MediaBrowser.Common.Implementations InstallationManager = new InstallationManager(LogManager.GetLogger("InstallationManager"), this, ApplicationPaths, HttpClient, JsonSerializer, SecurityManager, ConfigurationManager, FileSystemManager); RegisterSingleInstance(InstallationManager); - ZipClient = new ZipClient(FileSystemManager); - RegisterSingleInstance(ZipClient); - IsoManager = new IsoManager(); RegisterSingleInstance(IsoManager); diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index f68905ab9..ce776b245 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -45,30 +45,21 @@ <RunPostBuildEvent>Always</RunPostBuildEvent> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> - <HintPath>..\packages\NLog.4.3.8\lib\net45\NLog.dll</HintPath> + <HintPath>..\packages\NLog.4.3.10\lib\net45\NLog.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="Patterns.Logging"> <HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> </Reference> - <Reference Include="SharpCompress, Version=0.10.2.0, Culture=neutral, PublicKeyToken=beaf6f427e128133, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath> - </Reference> - <Reference Include="SimpleInjector, Version=3.2.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> - <HintPath>..\packages\SimpleInjector.3.2.2\lib\net45\SimpleInjector.dll</HintPath> + <Reference Include="SimpleInjector, Version=3.2.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> + <HintPath>..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="System" /> <Reference Include="System.Configuration" /> <Reference Include="System.Core" /> <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> <Reference Include="System.Net" /> <Reference Include="System.Xml" /> <Reference Include="ServiceStack.Text"> @@ -79,7 +70,6 @@ <Compile Include="..\SharedVersion.cs"> <Link>Properties\SharedVersion.cs</Link> </Compile> - <Compile Include="Archiving\ZipClient.cs" /> <Compile Include="BaseApplicationHost.cs" /> <Compile Include="BaseApplicationPaths.cs" /> <Compile Include="Configuration\BaseConfigurationManager.cs" /> @@ -91,7 +81,6 @@ <Compile Include="IO\IsoManager.cs" /> <Compile Include="IO\LnkShortcutHandler.cs" /> <Compile Include="IO\ManagedFileSystem.cs" /> - <Compile Include="IO\MemoryStreamProvider.cs" /> <Compile Include="IO\WindowsFileSystem.cs" /> <Compile Include="Logging\LogHelper.cs" /> <Compile Include="Logging\NLogger.cs" /> diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index 1dceb69bb..4eacd0d72 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net45" /> - <package id="NLog" version="4.3.8" targetFramework="net45" /> + <package id="NLog" version="4.3.10" targetFramework="net46" /> <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> - <package id="SimpleInjector" version="3.2.2" targetFramework="net45" /> + <package id="SimpleInjector" version="3.2.4" targetFramework="net46" /> </packages>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj index 107658e53..7c272200d 100644 --- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj +++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj @@ -39,8 +39,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Rssdp.NetFx40"> - <HintPath>..\ThirdParty\rssdp\Rssdp.NetFx40.dll</HintPath> + <Reference Include="Rssdp.Native"> + <HintPath>..\ThirdParty\rssdp\Rssdp.Native.dll</HintPath> </Reference> <Reference Include="Rssdp.Portable"> <HintPath>..\ThirdParty\rssdp\Rssdp.Portable.dll</HintPath> diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 7acff8fc8..a78d6cfd6 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.MediaEncoding.Encoder return new Tuple<List<string>, List<string>>(decoders, encoders); } - public bool ValidateVersion(string encoderAppPath) + public bool ValidateVersion(string encoderAppPath, bool logOutput) { string output = string.Empty; try @@ -37,6 +37,11 @@ namespace MediaBrowser.MediaEncoding.Encoder { } + if (logOutput) + { + _logger.Info("ffmpeg info: {0}", output ?? string.Empty); + } + if (string.IsNullOrWhiteSpace(output)) { return false; diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index ef838ed3d..69c0cf15f 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -241,7 +241,7 @@ namespace MediaBrowser.MediaEncoding.Encoder path = newPaths.Item1; - if (!ValidateVersion(path)) + if (!ValidateVersion(path, true)) { throw new ResourceNotFoundException("ffmpeg version 3.0 or greater is required."); } @@ -253,9 +253,9 @@ namespace MediaBrowser.MediaEncoding.Encoder Init(); } - private bool ValidateVersion(string path) + private bool ValidateVersion(string path, bool logOutput) { - return new EncoderValidator(_logger).ValidateVersion(path); + return new EncoderValidator(_logger).ValidateVersion(path, logOutput); } private void ConfigureEncoderPaths() @@ -307,7 +307,7 @@ namespace MediaBrowser.MediaEncoding.Encoder string encoderPath = null; string probePath = null; - if (_hasExternalEncoder && ValidateVersion(_originalFFMpegPath)) + if (_hasExternalEncoder && ValidateVersion(_originalFFMpegPath, true)) { encoderPath = _originalFFMpegPath; probePath = _originalFFProbePath; @@ -315,7 +315,7 @@ namespace MediaBrowser.MediaEncoding.Encoder if (string.IsNullOrWhiteSpace(encoderPath)) { - if (ValidateVersion("ffmpeg") && ValidateVersion("ffprobe")) + if (ValidateVersion("ffmpeg", true) && ValidateVersion("ffprobe", false)) { encoderPath = "ffmpeg"; probePath = "ffprobe"; diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs index 6393a87fb..1ab3f0bfb 100644 --- a/MediaBrowser.Model/Services/QueryParamCollection.cs +++ b/MediaBrowser.Model/Services/QueryParamCollection.cs @@ -160,5 +160,17 @@ namespace MediaBrowser.Model.Services //} } } + + private string GetQueryStringValue(NameValuePair pair) + { + return pair.Name + "=" + pair.Value; + } + + public override String ToString() + { + var vals = this.Select(GetQueryStringValue).ToArray(); + + return string.Join("&", vals); + } } } diff --git a/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs b/MediaBrowser.Server.Implementations/Archiving/ZipClient.cs index 24e816aef..29b922436 100644 --- a/MediaBrowser.Common.Implementations/Archiving/ZipClient.cs +++ b/MediaBrowser.Server.Implementations/Archiving/ZipClient.cs @@ -1,13 +1,13 @@ -using MediaBrowser.Model.IO; +using System.IO; +using MediaBrowser.Model.IO; using SharpCompress.Archive.Rar; using SharpCompress.Archive.SevenZip; using SharpCompress.Archive.Tar; using SharpCompress.Common; using SharpCompress.Reader; using SharpCompress.Reader.Zip; -using System.IO; -namespace MediaBrowser.Common.Implementations.Archiving +namespace MediaBrowser.Server.Implementations.Archiving { /// <summary> /// Class DotNetZipClient diff --git a/MediaBrowser.Common.Implementations/IO/MemoryStreamProvider.cs b/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs index cc3bf0788..0a0a04d5d 100644 --- a/MediaBrowser.Common.Implementations/IO/MemoryStreamProvider.cs +++ b/MediaBrowser.Server.Implementations/IO/MemoryStreamProvider.cs @@ -1,9 +1,8 @@ using System.IO; -using MediaBrowser.Common.IO; using MediaBrowser.Model.IO; using Microsoft.IO; -namespace MediaBrowser.Common.Implementations.IO +namespace MediaBrowser.Server.Implementations.IO { public class RecyclableMemoryStreamProvider : IMemoryStreamProvider { diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs index 89e989765..20b643911 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs @@ -205,7 +205,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV private bool EncodeVideo(MediaSourceInfo mediaSource) { - if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings) + if (_liveTvOptions.EnableOriginalVideoWithEncodedRecordings) { return false; } diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 71e964eec..854a9cecb 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -57,14 +57,22 @@ <HintPath>..\packages\MediaBrowser.Naming.1.0.0.55\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> + <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Patterns.Logging"> <HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> </Reference> <Reference Include="ServiceStack.Api.Swagger"> <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath> </Reference> - <Reference Include="SimpleInjector, Version=3.2.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> - <HintPath>..\packages\SimpleInjector.3.2.2\lib\net45\SimpleInjector.dll</HintPath> + <Reference Include="SharpCompress, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath> + </Reference> + <Reference Include="SimpleInjector, Version=3.2.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> + <HintPath>..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="SocketHttpListener, Version=1.0.6109.26162, Culture=neutral, processorArchitecture=MSIL"> @@ -103,6 +111,7 @@ </Compile> <Compile Include="Activity\ActivityManager.cs" /> <Compile Include="Activity\ActivityRepository.cs" /> + <Compile Include="Archiving\ZipClient.cs" /> <Compile Include="Branding\BrandingConfigurationFactory.cs" /> <Compile Include="Channels\ChannelConfigurations.cs" /> <Compile Include="Channels\ChannelDynamicMediaSourceProvider.cs" /> @@ -170,6 +179,7 @@ <Compile Include="Intros\DefaultIntroProvider.cs" /> <Compile Include="IO\FileRefresher.cs" /> <Compile Include="IO\LibraryMonitor.cs" /> + <Compile Include="IO\MemoryStreamProvider.cs" /> <Compile Include="IO\ThrottledStream.cs" /> <Compile Include="Library\CoreResolutionIgnoreRule.cs" /> <Compile Include="Library\LibraryManager.cs" /> diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 667f6b89a..ffae9a6f0 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -87,9 +87,6 @@ namespace MediaBrowser.Server.Implementations.Persistence private IDbCommand _deleteAncestorsCommand; private IDbCommand _saveAncestorCommand; - private IDbCommand _deleteUserDataKeysCommand; - private IDbCommand _saveUserDataKeysCommand; - private IDbCommand _deleteItemValuesCommand; private IDbCommand _saveItemValuesCommand; @@ -169,8 +166,6 @@ namespace MediaBrowser.Server.Implementations.Persistence "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)", "create index if not exists idx_AncestorIds2 on AncestorIds(AncestorIdText)", - "create table if not exists UserDataKeys (ItemId GUID, UserDataKey TEXT Priority INT, PRIMARY KEY (ItemId, UserDataKey))", - "create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT, CleanValue TEXT)", "create table if not exists ProviderIds (ItemId GUID, Name TEXT, Value TEXT, PRIMARY KEY (ItemId, Name))", @@ -192,6 +187,8 @@ namespace MediaBrowser.Server.Implementations.Persistence "create index if not exists idx_mediastreams1 on mediastreams(ItemId)", + //"drop table if exists UserDataKeys" + }; _connection.RunQueries(queries, Logger); @@ -289,7 +286,6 @@ namespace MediaBrowser.Server.Implementations.Persistence _connection.AddColumn(Logger, "TypedBaseItems", "ThemeSongIds", "Text"); _connection.AddColumn(Logger, "TypedBaseItems", "ThemeVideoIds", "Text"); - _connection.AddColumn(Logger, "UserDataKeys", "Priority", "INT"); _connection.AddColumn(Logger, "ItemValues", "CleanValue", "Text"); _connection.AddColumn(Logger, ChaptersTableName, "ImageDateModified", "DATETIME"); @@ -316,6 +312,8 @@ namespace MediaBrowser.Server.Implementations.Persistence "drop index if exists idx_ItemValues3", "drop index if exists idx_ItemValues4", "drop index if exists idx_ItemValues5", + "drop index if exists idx_UserDataKeys3", + "drop table if exists UserDataKeys", "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)", "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)", @@ -347,10 +345,7 @@ namespace MediaBrowser.Server.Implementations.Persistence // items by name "create index if not exists idx_ItemValues6 on ItemValues(ItemId,Type,CleanValue)", - "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)", - - // covering index - "create index if not exists idx_UserDataKeys3 on UserDataKeys(ItemId,Priority,UserDataKey)" + "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)" }; _connection.RunQueries(postQueries, Logger); @@ -653,17 +648,6 @@ namespace MediaBrowser.Server.Implementations.Persistence _updateInheritedTagsCommand.Parameters.Add(_updateInheritedTagsCommand, "@Guid"); _updateInheritedTagsCommand.Parameters.Add(_updateInheritedTagsCommand, "@InheritedTags"); - // user data - _deleteUserDataKeysCommand = _connection.CreateCommand(); - _deleteUserDataKeysCommand.CommandText = "delete from UserDataKeys where ItemId=@Id"; - _deleteUserDataKeysCommand.Parameters.Add(_deleteUserDataKeysCommand, "@Id"); - - _saveUserDataKeysCommand = _connection.CreateCommand(); - _saveUserDataKeysCommand.CommandText = "insert into UserDataKeys (ItemId, UserDataKey, Priority) values (@ItemId, @UserDataKey, @Priority)"; - _saveUserDataKeysCommand.Parameters.Add(_saveUserDataKeysCommand, "@ItemId"); - _saveUserDataKeysCommand.Parameters.Add(_saveUserDataKeysCommand, "@UserDataKey"); - _saveUserDataKeysCommand.Parameters.Add(_saveUserDataKeysCommand, "@Priority"); - // item values _deleteItemValuesCommand = _connection.CreateCommand(); _deleteItemValuesCommand.CommandText = "delete from ItemValues where ItemId=@Id"; @@ -1071,7 +1055,6 @@ namespace MediaBrowser.Server.Implementations.Persistence UpdateAncestors(item.Id, item.GetAncestorIds().Distinct().ToList(), transaction); } - UpdateUserDataKeys(item.Id, item.GetUserDataKeys().Distinct(StringComparer.OrdinalIgnoreCase).ToList(), transaction); UpdateImages(item.Id, item.ImageInfos, transaction); UpdateProviderIds(item.Id, item.ProviderIds, transaction); UpdateItemValues(item.Id, GetItemValuesToSave(item), transaction); @@ -2343,12 +2326,7 @@ namespace MediaBrowser.Server.Implementations.Persistence return string.Empty; } - if (_config.Configuration.SchemaVersion >= 96) - { - return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)"; - } - - return " left join UserDataDb.UserData on (select UserDataKey from UserDataKeys where ItemId=Guid order by Priority LIMIT 1)=UserDataDb.UserData.Key And (UserId=@UserId)"; + return " left join UserDataDb.UserData on UserDataKey=UserDataDb.UserData.Key And (UserId=@UserId)"; } private string GetGroupBy(InternalItemsQuery query) @@ -4176,11 +4154,6 @@ namespace MediaBrowser.Server.Implementations.Persistence _deleteAncestorsCommand.Transaction = transaction; _deleteAncestorsCommand.ExecuteNonQuery(); - // Delete user data keys - _deleteUserDataKeysCommand.GetParameter(0).Value = id; - _deleteUserDataKeysCommand.Transaction = transaction; - _deleteUserDataKeysCommand.ExecuteNonQuery(); - // Delete item values _deleteItemValuesCommand.GetParameter(0).Value = id; _deleteItemValuesCommand.Transaction = transaction; @@ -4949,39 +4922,6 @@ namespace MediaBrowser.Server.Implementations.Persistence } } - private void UpdateUserDataKeys(Guid itemId, List<string> keys, IDbTransaction transaction) - { - if (itemId == Guid.Empty) - { - throw new ArgumentNullException("itemId"); - } - - if (keys == null) - { - throw new ArgumentNullException("keys"); - } - - CheckDisposed(); - - // First delete - _deleteUserDataKeysCommand.GetParameter(0).Value = itemId; - _deleteUserDataKeysCommand.Transaction = transaction; - - _deleteUserDataKeysCommand.ExecuteNonQuery(); - var index = 0; - - foreach (var key in keys) - { - _saveUserDataKeysCommand.GetParameter(0).Value = itemId; - _saveUserDataKeysCommand.GetParameter(1).Value = key; - _saveUserDataKeysCommand.GetParameter(2).Value = index; - index++; - _saveUserDataKeysCommand.Transaction = transaction; - - _saveUserDataKeysCommand.ExecuteNonQuery(); - } - } - public async Task UpdatePeople(Guid itemId, List<PersonInfo> people) { if (itemId == Guid.Empty) diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index 8c2cd1592..522d2bbfd 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -4,7 +4,8 @@ <package id="ini-parser" version="2.3.0" targetFramework="net45" />
<package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />
<package id="MediaBrowser.Naming" version="1.0.0.55" targetFramework="net45" />
+ <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
- <package id="SimpleInjector" version="3.2.2" targetFramework="net45" />
+ <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
<package id="SocketHttpListener" version="1.0.0.40" targetFramework="net45" />
</packages>
\ No newline at end of file diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 9011f0bf5..b6e7bb5e9 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -117,6 +117,7 @@ using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Services; using MediaBrowser.Model.Social; using MediaBrowser.Model.Xml; +using MediaBrowser.Server.Implementations.Archiving; using MediaBrowser.Server.Implementations.Reflection; using MediaBrowser.Server.Implementations.Xml; using OpenSubtitlesHandler; @@ -222,6 +223,12 @@ namespace MediaBrowser.Server.Startup.Common private IMediaSourceManager MediaSourceManager { get; set; } private IPlaylistManager PlaylistManager { get; set; } + /// <summary> + /// Gets or sets the zip client. + /// </summary> + /// <value>The zip client.</value> + protected IZipClient ZipClient { get; private set; } + private readonly StartupOptions _startupOptions; private readonly string _releaseAssetFilename; @@ -380,6 +387,16 @@ namespace MediaBrowser.Server.Startup.Common LogManager.RemoveConsoleOutput(); } + protected override IMemoryStreamProvider CreateMemoryStreamProvider() + { + if (Environment.OSVersion.Platform == PlatformID.Win32NT) + { + return new RecyclableMemoryStreamProvider(); + } + + return new MemoryStreamProvider(); + } + protected override IJsonSerializer CreateJsonSerializer() { var result = base.CreateJsonSerializer(); @@ -625,6 +642,9 @@ namespace MediaBrowser.Server.Startup.Common { await base.RegisterResources(progress).ConfigureAwait(false); + ZipClient = new ZipClient(FileSystemManager); + RegisterSingleInstance(ZipClient); + RegisterSingleInstance<IHttpResultFactory>(new HttpResultFactory(LogManager, FileSystemManager, JsonSerializer)); RegisterSingleInstance<IServerApplicationHost>(this); diff --git a/OpenSubtitlesHandler/project.json b/OpenSubtitlesHandler/project.json index 12bc4de39..6710d0173 100644 --- a/OpenSubtitlesHandler/project.json +++ b/OpenSubtitlesHandler/project.json @@ -1,11 +1,11 @@ -{ +{ "supports": { "net46.app": {}, "dnxcore50.app": {} }, "dependencies": { "Microsoft.NETCore": "5.0.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.0" + "Microsoft.NETCore.Portable.Compatibility": "1.0.1" }, "frameworks": { "dotnet": { diff --git a/OpenSubtitlesHandler/project.lock.json b/OpenSubtitlesHandler/project.lock.json index 222e5e2c6..15b050908 100644 --- a/OpenSubtitlesHandler/project.lock.json +++ b/OpenSubtitlesHandler/project.lock.json @@ -74,7 +74,7 @@ } }, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { "compile": { "ref/net45/_._": {} }, @@ -740,7 +740,7 @@ } }, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { "compile": { "ref/net45/_._": {} }, @@ -1440,7 +1440,7 @@ } }, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { "compile": { "ref/net45/_._": {} }, @@ -2155,23 +2155,7 @@ } }, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { - "compile": { - "ref/dotnet/System.ComponentModel.DataAnnotations.dll": {}, - "ref/dotnet/System.Core.dll": {}, - "ref/dotnet/System.Net.dll": {}, - "ref/dotnet/System.Numerics.dll": {}, - "ref/dotnet/System.Runtime.Serialization.dll": {}, - "ref/dotnet/System.ServiceModel.Web.dll": {}, - "ref/dotnet/System.ServiceModel.dll": {}, - "ref/dotnet/System.Windows.dll": {}, - "ref/dotnet/System.Xml.Linq.dll": {}, - "ref/dotnet/System.Xml.Serialization.dll": {}, - "ref/dotnet/System.Xml.dll": {}, - "ref/dotnet/System.dll": {}, - "ref/dotnet/mscorlib.dll": {} - } - }, + "Microsoft.NETCore.Portable.Compatibility/1.0.1": {}, "Microsoft.NETCore.Targets/1.0.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.0" @@ -2945,42 +2929,48 @@ "System.Xml.XDocument": "4.0.10" } }, + "Microsoft.NETCore.Jit/1.0.2": {}, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { - "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.0" - }, - "compile": { - "ref/dotnet/System.ComponentModel.DataAnnotations.dll": {}, - "ref/dotnet/System.Core.dll": {}, - "ref/dotnet/System.Net.dll": {}, - "ref/dotnet/System.Numerics.dll": {}, - "ref/dotnet/System.Runtime.Serialization.dll": {}, - "ref/dotnet/System.ServiceModel.Web.dll": {}, - "ref/dotnet/System.ServiceModel.dll": {}, - "ref/dotnet/System.Windows.dll": {}, - "ref/dotnet/System.Xml.Linq.dll": {}, - "ref/dotnet/System.Xml.Serialization.dll": {}, - "ref/dotnet/System.Xml.dll": {}, - "ref/dotnet/System.dll": {}, - "ref/dotnet/mscorlib.dll": {} - }, - "runtime": { - "lib/dnxcore50/System.ComponentModel.DataAnnotations.dll": {}, - "lib/dnxcore50/System.Core.dll": {}, - "lib/dnxcore50/System.Net.dll": {}, - "lib/dnxcore50/System.Numerics.dll": {}, - "lib/dnxcore50/System.Runtime.Serialization.dll": {}, - "lib/dnxcore50/System.ServiceModel.Web.dll": {}, - "lib/dnxcore50/System.ServiceModel.dll": {}, - "lib/dnxcore50/System.Windows.dll": {}, - "lib/dnxcore50/System.Xml.Linq.dll": {}, - "lib/dnxcore50/System.Xml.Serialization.dll": {}, - "lib/dnxcore50/System.Xml.dll": {}, - "lib/dnxcore50/System.dll": {} - } - }, - "Microsoft.NETCore.Runtime/1.0.0": {}, + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { + "dependencies": { + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" + }, + "compile": { + "ref/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {}, + "ref/netstandard1.0/System.Core.dll": {}, + "ref/netstandard1.0/System.Net.dll": {}, + "ref/netstandard1.0/System.Numerics.dll": {}, + "ref/netstandard1.0/System.Runtime.Serialization.dll": {}, + "ref/netstandard1.0/System.ServiceModel.Web.dll": {}, + "ref/netstandard1.0/System.ServiceModel.dll": {}, + "ref/netstandard1.0/System.Windows.dll": {}, + "ref/netstandard1.0/System.Xml.Linq.dll": {}, + "ref/netstandard1.0/System.Xml.Serialization.dll": {}, + "ref/netstandard1.0/System.Xml.dll": {}, + "ref/netstandard1.0/System.dll": {}, + "ref/netstandard1.0/mscorlib.dll": {} + }, + "runtime": { + "lib/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {}, + "lib/netstandard1.0/System.Core.dll": {}, + "lib/netstandard1.0/System.Net.dll": {}, + "lib/netstandard1.0/System.Numerics.dll": {}, + "lib/netstandard1.0/System.Runtime.Serialization.dll": {}, + "lib/netstandard1.0/System.ServiceModel.Web.dll": {}, + "lib/netstandard1.0/System.ServiceModel.dll": {}, + "lib/netstandard1.0/System.Windows.dll": {}, + "lib/netstandard1.0/System.Xml.Linq.dll": {}, + "lib/netstandard1.0/System.Xml.Serialization.dll": {}, + "lib/netstandard1.0/System.Xml.dll": {}, + "lib/netstandard1.0/System.dll": {} + } + }, + "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "dependencies": { + "Microsoft.NETCore.Jit": "1.0.2", + "Microsoft.NETCore.Windows.ApiSets": "1.0.1" + } + }, "Microsoft.NETCore.Targets/1.0.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.0", @@ -2988,6 +2978,7 @@ } }, "Microsoft.NETCore.Targets.DNXCore/4.9.0": {}, + "Microsoft.NETCore.Windows.ApiSets/1.0.1": {}, "Microsoft.VisualBasic/10.0.0": { "dependencies": { "System.Collections": "4.0.10", @@ -4007,88 +3998,51 @@ "System.Xml.XDocument": "4.0.10" } }, + "Microsoft.NETCore.Jit/1.0.2": { + "dependencies": { + "runtime.win7-x64.Microsoft.NETCore.Jit": "1.0.2" + } + }, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { - "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.0" - }, - "compile": { - "ref/dotnet/System.ComponentModel.DataAnnotations.dll": {}, - "ref/dotnet/System.Core.dll": {}, - "ref/dotnet/System.Net.dll": {}, - "ref/dotnet/System.Numerics.dll": {}, - "ref/dotnet/System.Runtime.Serialization.dll": {}, - "ref/dotnet/System.ServiceModel.Web.dll": {}, - "ref/dotnet/System.ServiceModel.dll": {}, - "ref/dotnet/System.Windows.dll": {}, - "ref/dotnet/System.Xml.Linq.dll": {}, - "ref/dotnet/System.Xml.Serialization.dll": {}, - "ref/dotnet/System.Xml.dll": {}, - "ref/dotnet/System.dll": {}, - "ref/dotnet/mscorlib.dll": {} - }, - "runtime": { - "lib/dnxcore50/System.ComponentModel.DataAnnotations.dll": {}, - "lib/dnxcore50/System.Core.dll": {}, - "lib/dnxcore50/System.Net.dll": {}, - "lib/dnxcore50/System.Numerics.dll": {}, - "lib/dnxcore50/System.Runtime.Serialization.dll": {}, - "lib/dnxcore50/System.ServiceModel.Web.dll": {}, - "lib/dnxcore50/System.ServiceModel.dll": {}, - "lib/dnxcore50/System.Windows.dll": {}, - "lib/dnxcore50/System.Xml.Linq.dll": {}, - "lib/dnxcore50/System.Xml.Serialization.dll": {}, - "lib/dnxcore50/System.Xml.dll": {}, - "lib/dnxcore50/System.dll": {} - } - }, - "Microsoft.NETCore.Runtime/1.0.0": { - "dependencies": { - "Microsoft.NETCore.Runtime.CoreCLR-x64": "1.0.0", - "Microsoft.NETCore.Windows.ApiSets-x64": "1.0.0" - } - }, - "Microsoft.NETCore.Runtime.CoreCLR-x64/1.0.0": { - "dependencies": { - "System.Collections": "[4.0.10]", - "System.Diagnostics.Contracts": "[4.0.0]", - "System.Diagnostics.Debug": "[4.0.10]", - "System.Diagnostics.StackTrace": "[4.0.0]", - "System.Diagnostics.Tools": "[4.0.0]", - "System.Diagnostics.Tracing": "[4.0.20]", - "System.Globalization": "[4.0.10]", - "System.Globalization.Calendars": "[4.0.0]", - "System.IO": "[4.0.10]", - "System.ObjectModel": "[4.0.10]", - "System.Private.Uri": "[4.0.0]", - "System.Reflection": "[4.0.10]", - "System.Reflection.Extensions": "[4.0.0]", - "System.Reflection.Primitives": "[4.0.0]", - "System.Resources.ResourceManager": "[4.0.0]", - "System.Runtime": "[4.0.20]", - "System.Runtime.Extensions": "[4.0.10]", - "System.Runtime.Handles": "[4.0.0]", - "System.Runtime.InteropServices": "[4.0.20]", - "System.Text.Encoding": "[4.0.10]", - "System.Text.Encoding.Extensions": "[4.0.10]", - "System.Threading": "[4.0.10]", - "System.Threading.Tasks": "[4.0.10]", - "System.Threading.Timer": "[4.0.0]" - }, - "compile": { - "ref/dotnet/_._": {} - }, - "runtime": { - "runtimes/win7-x64/lib/dotnet/mscorlib.ni.dll": {} + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { + "dependencies": { + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" }, - "native": { - "runtimes/win7-x64/native/clretwrc.dll": {}, - "runtimes/win7-x64/native/coreclr.dll": {}, - "runtimes/win7-x64/native/dbgshim.dll": {}, - "runtimes/win7-x64/native/mscordaccore.dll": {}, - "runtimes/win7-x64/native/mscordbi.dll": {}, - "runtimes/win7-x64/native/mscorrc.debug.dll": {}, - "runtimes/win7-x64/native/mscorrc.dll": {} + "compile": { + "ref/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {}, + "ref/netstandard1.0/System.Core.dll": {}, + "ref/netstandard1.0/System.Net.dll": {}, + "ref/netstandard1.0/System.Numerics.dll": {}, + "ref/netstandard1.0/System.Runtime.Serialization.dll": {}, + "ref/netstandard1.0/System.ServiceModel.Web.dll": {}, + "ref/netstandard1.0/System.ServiceModel.dll": {}, + "ref/netstandard1.0/System.Windows.dll": {}, + "ref/netstandard1.0/System.Xml.Linq.dll": {}, + "ref/netstandard1.0/System.Xml.Serialization.dll": {}, + "ref/netstandard1.0/System.Xml.dll": {}, + "ref/netstandard1.0/System.dll": {}, + "ref/netstandard1.0/mscorlib.dll": {} + }, + "runtime": { + "lib/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {}, + "lib/netstandard1.0/System.Core.dll": {}, + "lib/netstandard1.0/System.Net.dll": {}, + "lib/netstandard1.0/System.Numerics.dll": {}, + "lib/netstandard1.0/System.Runtime.Serialization.dll": {}, + "lib/netstandard1.0/System.ServiceModel.Web.dll": {}, + "lib/netstandard1.0/System.ServiceModel.dll": {}, + "lib/netstandard1.0/System.Windows.dll": {}, + "lib/netstandard1.0/System.Xml.Linq.dll": {}, + "lib/netstandard1.0/System.Xml.Serialization.dll": {}, + "lib/netstandard1.0/System.Xml.dll": {}, + "lib/netstandard1.0/System.dll": {} + } + }, + "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "dependencies": { + "Microsoft.NETCore.Jit": "1.0.2", + "Microsoft.NETCore.Windows.ApiSets": "1.0.1", + "runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } }, "Microsoft.NETCore.Targets/1.0.0": { @@ -4098,7 +4052,76 @@ } }, "Microsoft.NETCore.Targets.DNXCore/4.9.0": {}, - "Microsoft.NETCore.Windows.ApiSets-x64/1.0.0": { + "Microsoft.NETCore.Windows.ApiSets/1.0.1": { + "dependencies": { + "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets": "1.0.1" + } + }, + "Microsoft.VisualBasic/10.0.0": { + "dependencies": { + "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.Dynamic.Runtime": "4.0.10", + "System.Globalization": "4.0.10", + "System.Linq": "4.0.0", + "System.Linq.Expressions": "4.0.10", + "System.ObjectModel": "4.0.10", + "System.Reflection": "4.0.10", + "System.Reflection.Extensions": "4.0.0", + "System.Reflection.Primitives": "4.0.0", + "System.Reflection.TypeExtensions": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.InteropServices": "4.0.20", + "System.Threading": "4.0.10" + }, + "compile": { + "ref/dotnet/Microsoft.VisualBasic.dll": {} + }, + "runtime": { + "lib/dotnet/Microsoft.VisualBasic.dll": {} + } + }, + "Microsoft.Win32.Primitives/4.0.0": { + "dependencies": { + "System.Runtime": "4.0.20", + "System.Runtime.InteropServices": "4.0.20" + }, + "compile": { + "ref/dotnet/Microsoft.Win32.Primitives.dll": {} + }, + "runtime": { + "lib/dotnet/Microsoft.Win32.Primitives.dll": {} + } + }, + "runtime.win7-x64.Microsoft.NETCore.Jit/1.0.2": { + "native": { + "runtimes/win7-x64/native/clrjit.dll": {} + } + }, + "runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "compile": { + "ref/netstandard1.0/_._": {} + }, + "runtime": { + "runtimes/win7-x64/lib/netstandard1.0/System.Private.CoreLib.dll": {}, + "runtimes/win7-x64/lib/netstandard1.0/mscorlib.dll": {} + }, + "native": { + "runtimes/win7-x64/native/System.Private.CoreLib.ni.dll": {}, + "runtimes/win7-x64/native/clretwrc.dll": {}, + "runtimes/win7-x64/native/coreclr.dll": {}, + "runtimes/win7-x64/native/dbgshim.dll": {}, + "runtimes/win7-x64/native/mscordaccore.dll": {}, + "runtimes/win7-x64/native/mscordbi.dll": {}, + "runtimes/win7-x64/native/mscorlib.ni.dll": {}, + "runtimes/win7-x64/native/mscorrc.debug.dll": {}, + "runtimes/win7-x64/native/mscorrc.dll": {}, + "runtimes/win7-x64/native/sos.dll": {} + } + }, + "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/1.0.1": { "native": { "runtimes/win7-x64/native/API-MS-Win-Base-Util-L1-1-0.dll": {}, "runtimes/win7-x64/native/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll": {}, @@ -4221,45 +4244,8 @@ "runtimes/win7-x64/native/api-ms-win-service-private-l1-1-0.dll": {}, "runtimes/win7-x64/native/api-ms-win-service-private-l1-1-1.dll": {}, "runtimes/win7-x64/native/api-ms-win-service-winsvc-l1-1-0.dll": {}, - "runtimes/win7-x64/native/ext-ms-win-advapi32-encryptedfile-l1-1-0.dll": {} - } - }, - "Microsoft.VisualBasic/10.0.0": { - "dependencies": { - "System.Collections": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Dynamic.Runtime": "4.0.10", - "System.Globalization": "4.0.10", - "System.Linq": "4.0.0", - "System.Linq.Expressions": "4.0.10", - "System.ObjectModel": "4.0.10", - "System.Reflection": "4.0.10", - "System.Reflection.Extensions": "4.0.0", - "System.Reflection.Primitives": "4.0.0", - "System.Reflection.TypeExtensions": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.InteropServices": "4.0.20", - "System.Threading": "4.0.10" - }, - "compile": { - "ref/dotnet/Microsoft.VisualBasic.dll": {} - }, - "runtime": { - "lib/dotnet/Microsoft.VisualBasic.dll": {} - } - }, - "Microsoft.Win32.Primitives/4.0.0": { - "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.InteropServices": "4.0.20" - }, - "compile": { - "ref/dotnet/Microsoft.Win32.Primitives.dll": {} - }, - "runtime": { - "lib/dotnet/Microsoft.Win32.Primitives.dll": {} + "runtimes/win7-x64/native/ext-ms-win-advapi32-encryptedfile-l1-1-0.dll": {}, + "runtimes/win7-x64/native/ext-ms-win-ntuser-keyboard-l1-2-1.dll": {} } }, "System.AppContext/4.0.0": { @@ -4383,17 +4369,6 @@ "lib/dotnet/System.ComponentModel.EventBasedAsync.dll": {} } }, - "System.Diagnostics.Contracts/4.0.0": { - "dependencies": { - "System.Runtime": "4.0.0" - }, - "compile": { - "ref/dotnet/System.Diagnostics.Contracts.dll": {} - }, - "runtime": { - "lib/DNXCore50/System.Diagnostics.Contracts.dll": {} - } - }, "System.Diagnostics.Debug/4.0.10": { "dependencies": { "System.Runtime": "4.0.0" @@ -4405,18 +4380,6 @@ "lib/DNXCore50/System.Diagnostics.Debug.dll": {} } }, - "System.Diagnostics.StackTrace/4.0.0": { - "dependencies": { - "System.Reflection": "4.0.0", - "System.Runtime": "4.0.0" - }, - "compile": { - "ref/dotnet/System.Diagnostics.StackTrace.dll": {} - }, - "runtime": { - "lib/DNXCore50/System.Diagnostics.StackTrace.dll": {} - } - }, "System.Diagnostics.Tools/4.0.0": { "dependencies": { "System.Runtime": "4.0.0" @@ -5295,88 +5258,51 @@ "System.Xml.XDocument": "4.0.10" } }, + "Microsoft.NETCore.Jit/1.0.2": { + "dependencies": { + "runtime.win7-x86.Microsoft.NETCore.Jit": "1.0.2" + } + }, "Microsoft.NETCore.Platforms/1.0.0": {}, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { - "dependencies": { - "Microsoft.NETCore.Runtime": "1.0.0" - }, - "compile": { - "ref/dotnet/System.ComponentModel.DataAnnotations.dll": {}, - "ref/dotnet/System.Core.dll": {}, - "ref/dotnet/System.Net.dll": {}, - "ref/dotnet/System.Numerics.dll": {}, - "ref/dotnet/System.Runtime.Serialization.dll": {}, - "ref/dotnet/System.ServiceModel.Web.dll": {}, - "ref/dotnet/System.ServiceModel.dll": {}, - "ref/dotnet/System.Windows.dll": {}, - "ref/dotnet/System.Xml.Linq.dll": {}, - "ref/dotnet/System.Xml.Serialization.dll": {}, - "ref/dotnet/System.Xml.dll": {}, - "ref/dotnet/System.dll": {}, - "ref/dotnet/mscorlib.dll": {} - }, - "runtime": { - "lib/dnxcore50/System.ComponentModel.DataAnnotations.dll": {}, - "lib/dnxcore50/System.Core.dll": {}, - "lib/dnxcore50/System.Net.dll": {}, - "lib/dnxcore50/System.Numerics.dll": {}, - "lib/dnxcore50/System.Runtime.Serialization.dll": {}, - "lib/dnxcore50/System.ServiceModel.Web.dll": {}, - "lib/dnxcore50/System.ServiceModel.dll": {}, - "lib/dnxcore50/System.Windows.dll": {}, - "lib/dnxcore50/System.Xml.Linq.dll": {}, - "lib/dnxcore50/System.Xml.Serialization.dll": {}, - "lib/dnxcore50/System.Xml.dll": {}, - "lib/dnxcore50/System.dll": {} - } - }, - "Microsoft.NETCore.Runtime/1.0.0": { - "dependencies": { - "Microsoft.NETCore.Runtime.CoreCLR-x86": "1.0.0", - "Microsoft.NETCore.Windows.ApiSets-x86": "1.0.0" - } - }, - "Microsoft.NETCore.Runtime.CoreCLR-x86/1.0.0": { - "dependencies": { - "System.Collections": "[4.0.10]", - "System.Diagnostics.Contracts": "[4.0.0]", - "System.Diagnostics.Debug": "[4.0.10]", - "System.Diagnostics.StackTrace": "[4.0.0]", - "System.Diagnostics.Tools": "[4.0.0]", - "System.Diagnostics.Tracing": "[4.0.20]", - "System.Globalization": "[4.0.10]", - "System.Globalization.Calendars": "[4.0.0]", - "System.IO": "[4.0.10]", - "System.ObjectModel": "[4.0.10]", - "System.Private.Uri": "[4.0.0]", - "System.Reflection": "[4.0.10]", - "System.Reflection.Extensions": "[4.0.0]", - "System.Reflection.Primitives": "[4.0.0]", - "System.Resources.ResourceManager": "[4.0.0]", - "System.Runtime": "[4.0.20]", - "System.Runtime.Extensions": "[4.0.10]", - "System.Runtime.Handles": "[4.0.0]", - "System.Runtime.InteropServices": "[4.0.20]", - "System.Text.Encoding": "[4.0.10]", - "System.Text.Encoding.Extensions": "[4.0.10]", - "System.Threading": "[4.0.10]", - "System.Threading.Tasks": "[4.0.10]", - "System.Threading.Timer": "[4.0.0]" - }, - "compile": { - "ref/dotnet/_._": {} - }, - "runtime": { - "runtimes/win7-x86/lib/dotnet/mscorlib.ni.dll": {} + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { + "dependencies": { + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" }, - "native": { - "runtimes/win7-x86/native/clretwrc.dll": {}, - "runtimes/win7-x86/native/coreclr.dll": {}, - "runtimes/win7-x86/native/dbgshim.dll": {}, - "runtimes/win7-x86/native/mscordaccore.dll": {}, - "runtimes/win7-x86/native/mscordbi.dll": {}, - "runtimes/win7-x86/native/mscorrc.debug.dll": {}, - "runtimes/win7-x86/native/mscorrc.dll": {} + "compile": { + "ref/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {}, + "ref/netstandard1.0/System.Core.dll": {}, + "ref/netstandard1.0/System.Net.dll": {}, + "ref/netstandard1.0/System.Numerics.dll": {}, + "ref/netstandard1.0/System.Runtime.Serialization.dll": {}, + "ref/netstandard1.0/System.ServiceModel.Web.dll": {}, + "ref/netstandard1.0/System.ServiceModel.dll": {}, + "ref/netstandard1.0/System.Windows.dll": {}, + "ref/netstandard1.0/System.Xml.Linq.dll": {}, + "ref/netstandard1.0/System.Xml.Serialization.dll": {}, + "ref/netstandard1.0/System.Xml.dll": {}, + "ref/netstandard1.0/System.dll": {}, + "ref/netstandard1.0/mscorlib.dll": {} + }, + "runtime": { + "lib/netstandard1.0/System.ComponentModel.DataAnnotations.dll": {}, + "lib/netstandard1.0/System.Core.dll": {}, + "lib/netstandard1.0/System.Net.dll": {}, + "lib/netstandard1.0/System.Numerics.dll": {}, + "lib/netstandard1.0/System.Runtime.Serialization.dll": {}, + "lib/netstandard1.0/System.ServiceModel.Web.dll": {}, + "lib/netstandard1.0/System.ServiceModel.dll": {}, + "lib/netstandard1.0/System.Windows.dll": {}, + "lib/netstandard1.0/System.Xml.Linq.dll": {}, + "lib/netstandard1.0/System.Xml.Serialization.dll": {}, + "lib/netstandard1.0/System.Xml.dll": {}, + "lib/netstandard1.0/System.dll": {} + } + }, + "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "dependencies": { + "Microsoft.NETCore.Jit": "1.0.2", + "Microsoft.NETCore.Windows.ApiSets": "1.0.1", + "runtime.win7-x86.Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } }, "Microsoft.NETCore.Targets/1.0.0": { @@ -5386,7 +5312,76 @@ } }, "Microsoft.NETCore.Targets.DNXCore/4.9.0": {}, - "Microsoft.NETCore.Windows.ApiSets-x86/1.0.0": { + "Microsoft.NETCore.Windows.ApiSets/1.0.1": { + "dependencies": { + "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets": "1.0.1" + } + }, + "Microsoft.VisualBasic/10.0.0": { + "dependencies": { + "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.Dynamic.Runtime": "4.0.10", + "System.Globalization": "4.0.10", + "System.Linq": "4.0.0", + "System.Linq.Expressions": "4.0.10", + "System.ObjectModel": "4.0.10", + "System.Reflection": "4.0.10", + "System.Reflection.Extensions": "4.0.0", + "System.Reflection.Primitives": "4.0.0", + "System.Reflection.TypeExtensions": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.InteropServices": "4.0.20", + "System.Threading": "4.0.10" + }, + "compile": { + "ref/dotnet/Microsoft.VisualBasic.dll": {} + }, + "runtime": { + "lib/dotnet/Microsoft.VisualBasic.dll": {} + } + }, + "Microsoft.Win32.Primitives/4.0.0": { + "dependencies": { + "System.Runtime": "4.0.20", + "System.Runtime.InteropServices": "4.0.20" + }, + "compile": { + "ref/dotnet/Microsoft.Win32.Primitives.dll": {} + }, + "runtime": { + "lib/dotnet/Microsoft.Win32.Primitives.dll": {} + } + }, + "runtime.win7-x86.Microsoft.NETCore.Jit/1.0.2": { + "native": { + "runtimes/win7-x86/native/clrjit.dll": {} + } + }, + "runtime.win7-x86.Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "compile": { + "ref/netstandard1.0/_._": {} + }, + "runtime": { + "runtimes/win7-x86/lib/netstandard1.0/System.Private.CoreLib.dll": {}, + "runtimes/win7-x86/lib/netstandard1.0/mscorlib.dll": {} + }, + "native": { + "runtimes/win7-x86/native/System.Private.CoreLib.ni.dll": {}, + "runtimes/win7-x86/native/clretwrc.dll": {}, + "runtimes/win7-x86/native/coreclr.dll": {}, + "runtimes/win7-x86/native/dbgshim.dll": {}, + "runtimes/win7-x86/native/mscordaccore.dll": {}, + "runtimes/win7-x86/native/mscordbi.dll": {}, + "runtimes/win7-x86/native/mscorlib.ni.dll": {}, + "runtimes/win7-x86/native/mscorrc.debug.dll": {}, + "runtimes/win7-x86/native/mscorrc.dll": {}, + "runtimes/win7-x86/native/sos.dll": {} + } + }, + "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets/1.0.1": { "native": { "runtimes/win7-x86/native/API-MS-Win-Base-Util-L1-1-0.dll": {}, "runtimes/win7-x86/native/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll": {}, @@ -5509,45 +5504,8 @@ "runtimes/win7-x86/native/api-ms-win-service-private-l1-1-0.dll": {}, "runtimes/win7-x86/native/api-ms-win-service-private-l1-1-1.dll": {}, "runtimes/win7-x86/native/api-ms-win-service-winsvc-l1-1-0.dll": {}, - "runtimes/win7-x86/native/ext-ms-win-advapi32-encryptedfile-l1-1-0.dll": {} - } - }, - "Microsoft.VisualBasic/10.0.0": { - "dependencies": { - "System.Collections": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Dynamic.Runtime": "4.0.10", - "System.Globalization": "4.0.10", - "System.Linq": "4.0.0", - "System.Linq.Expressions": "4.0.10", - "System.ObjectModel": "4.0.10", - "System.Reflection": "4.0.10", - "System.Reflection.Extensions": "4.0.0", - "System.Reflection.Primitives": "4.0.0", - "System.Reflection.TypeExtensions": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.InteropServices": "4.0.20", - "System.Threading": "4.0.10" - }, - "compile": { - "ref/dotnet/Microsoft.VisualBasic.dll": {} - }, - "runtime": { - "lib/dotnet/Microsoft.VisualBasic.dll": {} - } - }, - "Microsoft.Win32.Primitives/4.0.0": { - "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.InteropServices": "4.0.20" - }, - "compile": { - "ref/dotnet/Microsoft.Win32.Primitives.dll": {} - }, - "runtime": { - "lib/dotnet/Microsoft.Win32.Primitives.dll": {} + "runtimes/win7-x86/native/ext-ms-win-advapi32-encryptedfile-l1-1-0.dll": {}, + "runtimes/win7-x86/native/ext-ms-win-ntuser-keyboard-l1-2-1.dll": {} } }, "System.AppContext/4.0.0": { @@ -5671,17 +5629,6 @@ "lib/dotnet/System.ComponentModel.EventBasedAsync.dll": {} } }, - "System.Diagnostics.Contracts/4.0.0": { - "dependencies": { - "System.Runtime": "4.0.0" - }, - "compile": { - "ref/dotnet/System.Diagnostics.Contracts.dll": {} - }, - "runtime": { - "lib/DNXCore50/System.Diagnostics.Contracts.dll": {} - } - }, "System.Diagnostics.Debug/4.0.10": { "dependencies": { "System.Runtime": "4.0.0" @@ -5693,18 +5640,6 @@ "lib/DNXCore50/System.Diagnostics.Debug.dll": {} } }, - "System.Diagnostics.StackTrace/4.0.0": { - "dependencies": { - "System.Reflection": "4.0.0", - "System.Runtime": "4.0.0" - }, - "compile": { - "ref/dotnet/System.Diagnostics.StackTrace.dll": {} - }, - "runtime": { - "lib/DNXCore50/System.Diagnostics.StackTrace.dll": {} - } - }, "System.Diagnostics.Tools/4.0.0": { "dependencies": { "System.Runtime": "4.0.0" @@ -6549,6 +6484,18 @@ "_._" ] }, + "Microsoft.NETCore.Jit/1.0.2": { + "sha512": "Ok2vWofa6X8WD9vc4pfLHwvJz1/B6t3gOAoZcjrjrQf7lQOlNIuZIZtLn3wnWX28DuQGpPJkRlBxFj7Z5txNqw==", + "type": "package", + "path": "Microsoft.NETCore.Jit/1.0.2", + "files": [ + "Microsoft.NETCore.Jit.1.0.2.nupkg.sha512", + "Microsoft.NETCore.Jit.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "runtime.json" + ] + }, "Microsoft.NETCore.Platforms/1.0.0": { "sha512": "0N77OwGZpXqUco2C/ynv1os7HqdFYifvNIbveLDKqL5PZaz05Rl9enCwVBjF61aumHKueLWIJ3prnmdAXxww4A==", "type": "package", @@ -6559,25 +6506,15 @@ "runtime.json" ] }, - "Microsoft.NETCore.Portable.Compatibility/1.0.0": { - "sha512": "5/IFqf2zN1jzktRJitxO+5kQ+0AilcIbPvSojSJwDG3cGNSMZg44LXLB5E9RkSETE0Wh4QoALdNh1koKoF7/mA==", + "Microsoft.NETCore.Portable.Compatibility/1.0.1": { + "sha512": "Vd+lvLcGwvkedxtKn0U8s9uR4p0Lm+0U2QvDsLaw7g4S1W4KfPDbaW+ROhhLCSOx/gMYC72/b+z+o4fqS/oxVg==", "type": "package", - "path": "Microsoft.NETCore.Portable.Compatibility/1.0.0", + "path": "Microsoft.NETCore.Portable.Compatibility/1.0.1", "files": [ - "Microsoft.NETCore.Portable.Compatibility.1.0.0.nupkg.sha512", + "Microsoft.NETCore.Portable.Compatibility.1.0.1.nupkg.sha512", "Microsoft.NETCore.Portable.Compatibility.nuspec", - "lib/dnxcore50/System.ComponentModel.DataAnnotations.dll", - "lib/dnxcore50/System.Core.dll", - "lib/dnxcore50/System.Net.dll", - "lib/dnxcore50/System.Numerics.dll", - "lib/dnxcore50/System.Runtime.Serialization.dll", - "lib/dnxcore50/System.ServiceModel.Web.dll", - "lib/dnxcore50/System.ServiceModel.dll", - "lib/dnxcore50/System.Windows.dll", - "lib/dnxcore50/System.Xml.Linq.dll", - "lib/dnxcore50/System.Xml.Serialization.dll", - "lib/dnxcore50/System.Xml.dll", - "lib/dnxcore50/System.dll", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", "lib/net45/_._", "lib/netcore50/System.ComponentModel.DataAnnotations.dll", "lib/netcore50/System.Core.dll", @@ -6591,22 +6528,21 @@ "lib/netcore50/System.Xml.Serialization.dll", "lib/netcore50/System.Xml.dll", "lib/netcore50/System.dll", + "lib/netstandard1.0/System.ComponentModel.DataAnnotations.dll", + "lib/netstandard1.0/System.Core.dll", + "lib/netstandard1.0/System.Net.dll", + "lib/netstandard1.0/System.Numerics.dll", + "lib/netstandard1.0/System.Runtime.Serialization.dll", + "lib/netstandard1.0/System.ServiceModel.Web.dll", + "lib/netstandard1.0/System.ServiceModel.dll", + "lib/netstandard1.0/System.Windows.dll", + "lib/netstandard1.0/System.Xml.Linq.dll", + "lib/netstandard1.0/System.Xml.Serialization.dll", + "lib/netstandard1.0/System.Xml.dll", + "lib/netstandard1.0/System.dll", "lib/win8/_._", "lib/wp80/_._", "lib/wpa81/_._", - "ref/dotnet/System.ComponentModel.DataAnnotations.dll", - "ref/dotnet/System.Core.dll", - "ref/dotnet/System.Net.dll", - "ref/dotnet/System.Numerics.dll", - "ref/dotnet/System.Runtime.Serialization.dll", - "ref/dotnet/System.ServiceModel.Web.dll", - "ref/dotnet/System.ServiceModel.dll", - "ref/dotnet/System.Windows.dll", - "ref/dotnet/System.Xml.Linq.dll", - "ref/dotnet/System.Xml.Serialization.dll", - "ref/dotnet/System.Xml.dll", - "ref/dotnet/System.dll", - "ref/dotnet/mscorlib.dll", "ref/net45/_._", "ref/netcore50/System.ComponentModel.DataAnnotations.dll", "ref/netcore50/System.Core.dll", @@ -6621,6 +6557,19 @@ "ref/netcore50/System.Xml.dll", "ref/netcore50/System.dll", "ref/netcore50/mscorlib.dll", + "ref/netstandard1.0/System.ComponentModel.DataAnnotations.dll", + "ref/netstandard1.0/System.Core.dll", + "ref/netstandard1.0/System.Net.dll", + "ref/netstandard1.0/System.Numerics.dll", + "ref/netstandard1.0/System.Runtime.Serialization.dll", + "ref/netstandard1.0/System.ServiceModel.Web.dll", + "ref/netstandard1.0/System.ServiceModel.dll", + "ref/netstandard1.0/System.Windows.dll", + "ref/netstandard1.0/System.Xml.Linq.dll", + "ref/netstandard1.0/System.Xml.Serialization.dll", + "ref/netstandard1.0/System.Xml.dll", + "ref/netstandard1.0/System.dll", + "ref/netstandard1.0/mscorlib.dll", "ref/win8/_._", "ref/wp80/_._", "ref/wpa81/_._", @@ -6639,52 +6588,18 @@ "runtimes/aot/lib/netcore50/mscorlib.dll" ] }, - "Microsoft.NETCore.Runtime/1.0.0": { - "sha512": "AjaMNpXLW4miEQorIqyn6iQ+BZBId6qXkhwyeh1vl6kXLqosZusbwmLNlvj/xllSQrd3aImJbvlHusam85g+xQ==", + "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "sha512": "A0x1xtTjYJWZr2DRzgfCOXgB0JkQg8twnmtTJ79wFje+IihlLbXtx6Z2AxyVokBM5ruwTedR6YdCmHk39QJdtQ==", "type": "package", - "path": "Microsoft.NETCore.Runtime/1.0.0", + "path": "Microsoft.NETCore.Runtime.CoreCLR/1.0.2", "files": [ - "Microsoft.NETCore.Runtime.1.0.0.nupkg.sha512", - "Microsoft.NETCore.Runtime.nuspec", + "Microsoft.NETCore.Runtime.CoreCLR.1.0.2.nupkg.sha512", + "Microsoft.NETCore.Runtime.CoreCLR.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", "runtime.json" ] }, - "Microsoft.NETCore.Runtime.CoreCLR-x64/1.0.0": { - "sha512": "DaY5Z13xCZpnVIGluC5sCo4/0wy1rl6mptBH7v3RYi3guAmG88aSeFoQzyZepo0H0jEixUxNFM0+MB6Jc+j0bw==", - "type": "package", - "path": "Microsoft.NETCore.Runtime.CoreCLR-x64/1.0.0", - "files": [ - "Microsoft.NETCore.Runtime.CoreCLR-x64.1.0.0.nupkg.sha512", - "Microsoft.NETCore.Runtime.CoreCLR-x64.nuspec", - "ref/dotnet/_._", - "runtimes/win7-x64/lib/dotnet/mscorlib.ni.dll", - "runtimes/win7-x64/native/clretwrc.dll", - "runtimes/win7-x64/native/coreclr.dll", - "runtimes/win7-x64/native/dbgshim.dll", - "runtimes/win7-x64/native/mscordaccore.dll", - "runtimes/win7-x64/native/mscordbi.dll", - "runtimes/win7-x64/native/mscorrc.debug.dll", - "runtimes/win7-x64/native/mscorrc.dll" - ] - }, - "Microsoft.NETCore.Runtime.CoreCLR-x86/1.0.0": { - "sha512": "2LDffu5Is/X01GVPVuye4Wmz9/SyGDNq1Opgl5bXG3206cwNiCwsQgILOtfSWVp5mn4w401+8cjhBy3THW8HQQ==", - "type": "package", - "path": "Microsoft.NETCore.Runtime.CoreCLR-x86/1.0.0", - "files": [ - "Microsoft.NETCore.Runtime.CoreCLR-x86.1.0.0.nupkg.sha512", - "Microsoft.NETCore.Runtime.CoreCLR-x86.nuspec", - "ref/dotnet/_._", - "runtimes/win7-x86/lib/dotnet/mscorlib.ni.dll", - "runtimes/win7-x86/native/clretwrc.dll", - "runtimes/win7-x86/native/coreclr.dll", - "runtimes/win7-x86/native/dbgshim.dll", - "runtimes/win7-x86/native/mscordaccore.dll", - "runtimes/win7-x86/native/mscordbi.dll", - "runtimes/win7-x86/native/mscorrc.debug.dll", - "runtimes/win7-x86/native/mscorrc.dll" - ] - }, "Microsoft.NETCore.Targets/1.0.0": { "sha512": "XfITpPjYLYRmAeZtb9diw6P7ylLQsSC1U2a/xj10iQpnHxkiLEBXop/psw15qMPuNca7lqgxWvzZGpQxphuXaw==", "type": "package", @@ -6715,14 +6630,127 @@ "runtime.json" ] }, - "Microsoft.NETCore.Windows.ApiSets-x64/1.0.0": { - "sha512": "NC+dpFMdhujz2sWAdJ8EmBk07p1zOlNi0FCCnZEbzftABpw9xZ99EMP/bUJrPTgCxHfzJAiuLPOtAauzVINk0w==", + "Microsoft.NETCore.Windows.ApiSets/1.0.1": { + "sha512": "v0VoHQbaaMqLMnVJTlmLPDUMV94cqvDXqPb43DaMRalcg6TDNrC9O7yilYKH0j5bkATyH0yo1+FIzutHr+nHqA==", "type": "package", - "path": "Microsoft.NETCore.Windows.ApiSets-x64/1.0.0", + "path": "Microsoft.NETCore.Windows.ApiSets/1.0.1", "files": [ - "Microsoft.NETCore.Windows.ApiSets-x64.1.0.0.nupkg.sha512", - "Microsoft.NETCore.Windows.ApiSets-x64.nuspec", - "runtimes/win10-x64/native/_._", + "Microsoft.NETCore.Windows.ApiSets.1.0.1.nupkg.sha512", + "Microsoft.NETCore.Windows.ApiSets.nuspec", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "runtime.json" + ] + }, + "Microsoft.VisualBasic/10.0.0": { + "sha512": "5BEm2/HAVd97whRlCChU7rmSh/9cwGlZ/NTNe3Jl07zuPWfKQq5TUvVNUmdvmEe8QRecJLZ4/e7WF1i1O8V42g==", + "type": "package", + "path": "Microsoft.VisualBasic/10.0.0", + "files": [ + "Microsoft.VisualBasic.10.0.0.nupkg.sha512", + "Microsoft.VisualBasic.nuspec", + "lib/dotnet/Microsoft.VisualBasic.dll", + "lib/net45/_._", + "lib/netcore50/Microsoft.VisualBasic.dll", + "lib/win8/_._", + "lib/wpa81/_._", + "ref/dotnet/Microsoft.VisualBasic.dll", + "ref/dotnet/Microsoft.VisualBasic.xml", + "ref/dotnet/de/Microsoft.VisualBasic.xml", + "ref/dotnet/es/Microsoft.VisualBasic.xml", + "ref/dotnet/fr/Microsoft.VisualBasic.xml", + "ref/dotnet/it/Microsoft.VisualBasic.xml", + "ref/dotnet/ja/Microsoft.VisualBasic.xml", + "ref/dotnet/ko/Microsoft.VisualBasic.xml", + "ref/dotnet/ru/Microsoft.VisualBasic.xml", + "ref/dotnet/zh-hans/Microsoft.VisualBasic.xml", + "ref/dotnet/zh-hant/Microsoft.VisualBasic.xml", + "ref/net45/_._", + "ref/netcore50/Microsoft.VisualBasic.dll", + "ref/netcore50/Microsoft.VisualBasic.xml", + "ref/win8/_._", + "ref/wpa81/_._" + ] + }, + "Microsoft.Win32.Primitives/4.0.0": { + "sha512": "CypEz9/lLOup8CEhiAmvr7aLs1zKPYyEU1sxQeEr6G0Ci8/F0Y6pYR1zzkROjM8j8Mq0typmbu676oYyvErQvg==", + "type": "package", + "path": "Microsoft.Win32.Primitives/4.0.0", + "files": [ + "Microsoft.Win32.Primitives.4.0.0.nupkg.sha512", + "Microsoft.Win32.Primitives.nuspec", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/dotnet/Microsoft.Win32.Primitives.dll", + "lib/net46/Microsoft.Win32.Primitives.dll", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "ref/MonoAndroid10/_._", + "ref/MonoTouch10/_._", + "ref/dotnet/Microsoft.Win32.Primitives.dll", + "ref/dotnet/Microsoft.Win32.Primitives.xml", + "ref/dotnet/de/Microsoft.Win32.Primitives.xml", + "ref/dotnet/es/Microsoft.Win32.Primitives.xml", + "ref/dotnet/fr/Microsoft.Win32.Primitives.xml", + "ref/dotnet/it/Microsoft.Win32.Primitives.xml", + "ref/dotnet/ja/Microsoft.Win32.Primitives.xml", + "ref/dotnet/ko/Microsoft.Win32.Primitives.xml", + "ref/dotnet/ru/Microsoft.Win32.Primitives.xml", + "ref/dotnet/zh-hans/Microsoft.Win32.Primitives.xml", + "ref/dotnet/zh-hant/Microsoft.Win32.Primitives.xml", + "ref/net46/Microsoft.Win32.Primitives.dll", + "ref/xamarinios10/_._", + "ref/xamarinmac20/_._" + ] + }, + "runtime.win7-x64.Microsoft.NETCore.Jit/1.0.2": { + "sha512": "Jd3q9BKO+Sun6mPXRvHZMYG0WJmnASjXUxsT5MJwBoz8xbeZRTuFTPD5RtNlKxxioCiWR/hp3mKgYjlJ4dLQsw==", + "type": "package", + "path": "runtime.win7-x64.Microsoft.NETCore.Jit/1.0.2", + "files": [ + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "runtime.win7-x64.Microsoft.NETCore.Jit.1.0.2.nupkg.sha512", + "runtime.win7-x64.Microsoft.NETCore.Jit.nuspec", + "runtimes/win7-x64/native/clrjit.dll" + ] + }, + "runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "sha512": "YaXA5RVLCYIcV1N31A7MJhWJnNkNfGnyRBNH1yYilUrBDvzMxNsbXX2pD7owWsC/go/4LRwbHbdWWXwHowKNvw==", + "type": "package", + "path": "runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR/1.0.2", + "files": [ + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "ref/netstandard1.0/_._", + "runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR.1.0.2.nupkg.sha512", + "runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR.nuspec", + "runtimes/win7-x64-aot/lib/netstandard1.0/_._", + "runtimes/win7-x64-aot/native/_._", + "runtimes/win7-x64/lib/netstandard1.0/System.Private.CoreLib.dll", + "runtimes/win7-x64/lib/netstandard1.0/mscorlib.dll", + "runtimes/win7-x64/native/System.Private.CoreLib.ni.dll", + "runtimes/win7-x64/native/clretwrc.dll", + "runtimes/win7-x64/native/coreclr.dll", + "runtimes/win7-x64/native/dbgshim.dll", + "runtimes/win7-x64/native/mscordaccore.dll", + "runtimes/win7-x64/native/mscordbi.dll", + "runtimes/win7-x64/native/mscorlib.ni.dll", + "runtimes/win7-x64/native/mscorrc.debug.dll", + "runtimes/win7-x64/native/mscorrc.dll", + "runtimes/win7-x64/native/sos.dll", + "tools/crossgen.exe" + ] + }, + "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/1.0.1": { + "sha512": "jlT1ClqaOhEfpLpPU3iNpbmHnoPBe+T01509Q+tlxnax7ZXUsY6L22Vow6jj2koYY9u1GR6g6/UJXZRQihDAvw==", + "type": "package", + "path": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/1.0.1", + "files": [ + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets.1.0.1.nupkg.sha512", + "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets.nuspec", "runtimes/win7-x64/native/API-MS-Win-Base-Util-L1-1-0.dll", "runtimes/win7-x64/native/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll", "runtimes/win7-x64/native/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll", @@ -6845,50 +6873,57 @@ "runtimes/win7-x64/native/api-ms-win-service-private-l1-1-1.dll", "runtimes/win7-x64/native/api-ms-win-service-winsvc-l1-1-0.dll", "runtimes/win7-x64/native/ext-ms-win-advapi32-encryptedfile-l1-1-0.dll", - "runtimes/win8-x64/native/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll", - "runtimes/win8-x64/native/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll", - "runtimes/win8-x64/native/API-MS-Win-devices-config-L1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-file-l1-2-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-file-l2-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-kernel32-legacy-l1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-kernel32-legacy-l1-1-2.dll", - "runtimes/win8-x64/native/api-ms-win-core-localization-l1-2-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-localization-obsolete-l1-2-0.dll", - "runtimes/win8-x64/native/api-ms-win-core-memory-l1-1-2.dll", - "runtimes/win8-x64/native/api-ms-win-core-memory-l1-1-3.dll", - "runtimes/win8-x64/native/api-ms-win-core-namedpipe-l1-2-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-privateprofile-l1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-processthreads-l1-1-2.dll", - "runtimes/win8-x64/native/api-ms-win-core-shutdown-l1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-string-obsolete-l1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-stringloader-l1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-sysinfo-l1-2-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-sysinfo-l1-2-2.dll", - "runtimes/win8-x64/native/api-ms-win-core-sysinfo-l1-2-3.dll", - "runtimes/win8-x64/native/api-ms-win-core-winrt-error-l1-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-core-xstate-l2-1-0.dll", - "runtimes/win8-x64/native/api-ms-win-security-cpwl-l1-1-0.dll", - "runtimes/win8-x64/native/api-ms-win-security-cryptoapi-l1-1-0.dll", - "runtimes/win8-x64/native/api-ms-win-security-lsalookup-l2-1-1.dll", - "runtimes/win8-x64/native/api-ms-win-service-private-l1-1-1.dll", - "runtimes/win81-x64/native/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll", - "runtimes/win81-x64/native/api-ms-win-core-kernel32-legacy-l1-1-2.dll", - "runtimes/win81-x64/native/api-ms-win-core-memory-l1-1-3.dll", - "runtimes/win81-x64/native/api-ms-win-core-namedpipe-l1-2-1.dll", - "runtimes/win81-x64/native/api-ms-win-core-string-obsolete-l1-1-1.dll", - "runtimes/win81-x64/native/api-ms-win-core-sysinfo-l1-2-2.dll", - "runtimes/win81-x64/native/api-ms-win-core-sysinfo-l1-2-3.dll", - "runtimes/win81-x64/native/api-ms-win-security-cpwl-l1-1-0.dll" + "runtimes/win7-x64/native/ext-ms-win-ntuser-keyboard-l1-2-1.dll" + ] + }, + "runtime.win7-x86.Microsoft.NETCore.Jit/1.0.2": { + "sha512": "DEDFKUREtfMZue7qIGNelkZqay6bpC1iTWt/ZFQ0yxnqtINXmVYiOW9ML7w/1E4WBUaPCUo4tKWasK53c063qg==", + "type": "package", + "path": "runtime.win7-x86.Microsoft.NETCore.Jit/1.0.2", + "files": [ + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "runtime.win7-x86.Microsoft.NETCore.Jit.1.0.2.nupkg.sha512", + "runtime.win7-x86.Microsoft.NETCore.Jit.nuspec", + "runtimes/win7-x86/native/clrjit.dll" ] }, - "Microsoft.NETCore.Windows.ApiSets-x86/1.0.0": { - "sha512": "/HDRdhz5bZyhHwQ/uk/IbnDIX5VDTsHntEZYkTYo57dM+U3Ttel9/OJv0mjL64wTO/QKUJJNKp9XO+m7nSVjJQ==", + "runtime.win7-x86.Microsoft.NETCore.Runtime.CoreCLR/1.0.2": { + "sha512": "80Jj8QlMLAnTq+BDhoHBnSNXRKqVjjZM9VjHcpw9/F98cBmh80rBdbnM0AAr54htjhzupYvwLqwuKnlzxec04A==", "type": "package", - "path": "Microsoft.NETCore.Windows.ApiSets-x86/1.0.0", + "path": "runtime.win7-x86.Microsoft.NETCore.Runtime.CoreCLR/1.0.2", "files": [ - "Microsoft.NETCore.Windows.ApiSets-x86.1.0.0.nupkg.sha512", - "Microsoft.NETCore.Windows.ApiSets-x86.nuspec", - "runtimes/win10-x86/native/_._", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "ref/netstandard1.0/_._", + "runtime.win7-x86.Microsoft.NETCore.Runtime.CoreCLR.1.0.2.nupkg.sha512", + "runtime.win7-x86.Microsoft.NETCore.Runtime.CoreCLR.nuspec", + "runtimes/win7-x86-aot/lib/netstandard1.0/_._", + "runtimes/win7-x86-aot/native/_._", + "runtimes/win7-x86/lib/netstandard1.0/System.Private.CoreLib.dll", + "runtimes/win7-x86/lib/netstandard1.0/mscorlib.dll", + "runtimes/win7-x86/native/System.Private.CoreLib.ni.dll", + "runtimes/win7-x86/native/clretwrc.dll", + "runtimes/win7-x86/native/coreclr.dll", + "runtimes/win7-x86/native/dbgshim.dll", + "runtimes/win7-x86/native/mscordaccore.dll", + "runtimes/win7-x86/native/mscordbi.dll", + "runtimes/win7-x86/native/mscorlib.ni.dll", + "runtimes/win7-x86/native/mscorrc.debug.dll", + "runtimes/win7-x86/native/mscorrc.dll", + "runtimes/win7-x86/native/sos.dll", + "tools/crossgen.exe" + ] + }, + "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets/1.0.1": { + "sha512": "bPLbJzMJpczV+EMU4CK2Hb+DJrX3C93dXPMe+JsArqFTnJ9ou+xAa3lHt2qbWvzVVR1OMpgQUpB7aug6PcRPbA==", + "type": "package", + "path": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets/1.0.1", + "files": [ + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets.1.0.1.nupkg.sha512", + "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets.nuspec", "runtimes/win7-x86/native/API-MS-Win-Base-Util-L1-1-0.dll", "runtimes/win7-x86/native/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll", "runtimes/win7-x86/native/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll", @@ -7011,101 +7046,7 @@ "runtimes/win7-x86/native/api-ms-win-service-private-l1-1-1.dll", "runtimes/win7-x86/native/api-ms-win-service-winsvc-l1-1-0.dll", "runtimes/win7-x86/native/ext-ms-win-advapi32-encryptedfile-l1-1-0.dll", - "runtimes/win8-x86/native/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll", - "runtimes/win8-x86/native/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll", - "runtimes/win8-x86/native/API-MS-Win-devices-config-L1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-file-l1-2-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-file-l2-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-kernel32-legacy-l1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-kernel32-legacy-l1-1-2.dll", - "runtimes/win8-x86/native/api-ms-win-core-localization-l1-2-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-localization-obsolete-l1-2-0.dll", - "runtimes/win8-x86/native/api-ms-win-core-memory-l1-1-2.dll", - "runtimes/win8-x86/native/api-ms-win-core-memory-l1-1-3.dll", - "runtimes/win8-x86/native/api-ms-win-core-namedpipe-l1-2-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-privateprofile-l1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-processthreads-l1-1-2.dll", - "runtimes/win8-x86/native/api-ms-win-core-shutdown-l1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-string-obsolete-l1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-stringloader-l1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-sysinfo-l1-2-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-sysinfo-l1-2-2.dll", - "runtimes/win8-x86/native/api-ms-win-core-sysinfo-l1-2-3.dll", - "runtimes/win8-x86/native/api-ms-win-core-winrt-error-l1-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-core-xstate-l2-1-0.dll", - "runtimes/win8-x86/native/api-ms-win-security-cpwl-l1-1-0.dll", - "runtimes/win8-x86/native/api-ms-win-security-cryptoapi-l1-1-0.dll", - "runtimes/win8-x86/native/api-ms-win-security-lsalookup-l2-1-1.dll", - "runtimes/win8-x86/native/api-ms-win-service-private-l1-1-1.dll", - "runtimes/win81-x86/native/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll", - "runtimes/win81-x86/native/api-ms-win-core-kernel32-legacy-l1-1-2.dll", - "runtimes/win81-x86/native/api-ms-win-core-memory-l1-1-3.dll", - "runtimes/win81-x86/native/api-ms-win-core-namedpipe-l1-2-1.dll", - "runtimes/win81-x86/native/api-ms-win-core-string-obsolete-l1-1-1.dll", - "runtimes/win81-x86/native/api-ms-win-core-sysinfo-l1-2-2.dll", - "runtimes/win81-x86/native/api-ms-win-core-sysinfo-l1-2-3.dll", - "runtimes/win81-x86/native/api-ms-win-security-cpwl-l1-1-0.dll" - ] - }, - "Microsoft.VisualBasic/10.0.0": { - "sha512": "5BEm2/HAVd97whRlCChU7rmSh/9cwGlZ/NTNe3Jl07zuPWfKQq5TUvVNUmdvmEe8QRecJLZ4/e7WF1i1O8V42g==", - "type": "package", - "path": "Microsoft.VisualBasic/10.0.0", - "files": [ - "Microsoft.VisualBasic.10.0.0.nupkg.sha512", - "Microsoft.VisualBasic.nuspec", - "lib/dotnet/Microsoft.VisualBasic.dll", - "lib/net45/_._", - "lib/netcore50/Microsoft.VisualBasic.dll", - "lib/win8/_._", - "lib/wpa81/_._", - "ref/dotnet/Microsoft.VisualBasic.dll", - "ref/dotnet/Microsoft.VisualBasic.xml", - "ref/dotnet/de/Microsoft.VisualBasic.xml", - "ref/dotnet/es/Microsoft.VisualBasic.xml", - "ref/dotnet/fr/Microsoft.VisualBasic.xml", - "ref/dotnet/it/Microsoft.VisualBasic.xml", - "ref/dotnet/ja/Microsoft.VisualBasic.xml", - "ref/dotnet/ko/Microsoft.VisualBasic.xml", - "ref/dotnet/ru/Microsoft.VisualBasic.xml", - "ref/dotnet/zh-hans/Microsoft.VisualBasic.xml", - "ref/dotnet/zh-hant/Microsoft.VisualBasic.xml", - "ref/net45/_._", - "ref/netcore50/Microsoft.VisualBasic.dll", - "ref/netcore50/Microsoft.VisualBasic.xml", - "ref/win8/_._", - "ref/wpa81/_._" - ] - }, - "Microsoft.Win32.Primitives/4.0.0": { - "sha512": "CypEz9/lLOup8CEhiAmvr7aLs1zKPYyEU1sxQeEr6G0Ci8/F0Y6pYR1zzkROjM8j8Mq0typmbu676oYyvErQvg==", - "type": "package", - "path": "Microsoft.Win32.Primitives/4.0.0", - "files": [ - "Microsoft.Win32.Primitives.4.0.0.nupkg.sha512", - "Microsoft.Win32.Primitives.nuspec", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/dotnet/Microsoft.Win32.Primitives.dll", - "lib/net46/Microsoft.Win32.Primitives.dll", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/dotnet/Microsoft.Win32.Primitives.dll", - "ref/dotnet/Microsoft.Win32.Primitives.xml", - "ref/dotnet/de/Microsoft.Win32.Primitives.xml", - "ref/dotnet/es/Microsoft.Win32.Primitives.xml", - "ref/dotnet/fr/Microsoft.Win32.Primitives.xml", - "ref/dotnet/it/Microsoft.Win32.Primitives.xml", - "ref/dotnet/ja/Microsoft.Win32.Primitives.xml", - "ref/dotnet/ko/Microsoft.Win32.Primitives.xml", - "ref/dotnet/ru/Microsoft.Win32.Primitives.xml", - "ref/dotnet/zh-hans/Microsoft.Win32.Primitives.xml", - "ref/dotnet/zh-hant/Microsoft.Win32.Primitives.xml", - "ref/net46/Microsoft.Win32.Primitives.dll", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._" + "runtimes/win7-x86/native/ext-ms-win-ntuser-keyboard-l1-2-1.dll" ] }, "System.AppContext/4.0.0": { @@ -7342,39 +7283,6 @@ "ref/xamarinmac20/_._" ] }, - "System.Diagnostics.Contracts/4.0.0": { - "sha512": "lMc7HNmyIsu0pKTdA4wf+FMq5jvouUd+oUpV4BdtyqoV0Pkbg9u/7lTKFGqpjZRQosWHq1+B32Lch2wf4AmloA==", - "type": "package", - "path": "System.Diagnostics.Contracts/4.0.0", - "files": [ - "System.Diagnostics.Contracts.4.0.0.nupkg.sha512", - "System.Diagnostics.Contracts.nuspec", - "lib/DNXCore50/System.Diagnostics.Contracts.dll", - "lib/net45/_._", - "lib/netcore50/System.Diagnostics.Contracts.dll", - "lib/win8/_._", - "lib/wp80/_._", - "lib/wpa81/_._", - "ref/dotnet/System.Diagnostics.Contracts.dll", - "ref/dotnet/System.Diagnostics.Contracts.xml", - "ref/dotnet/de/System.Diagnostics.Contracts.xml", - "ref/dotnet/es/System.Diagnostics.Contracts.xml", - "ref/dotnet/fr/System.Diagnostics.Contracts.xml", - "ref/dotnet/it/System.Diagnostics.Contracts.xml", - "ref/dotnet/ja/System.Diagnostics.Contracts.xml", - "ref/dotnet/ko/System.Diagnostics.Contracts.xml", - "ref/dotnet/ru/System.Diagnostics.Contracts.xml", - "ref/dotnet/zh-hans/System.Diagnostics.Contracts.xml", - "ref/dotnet/zh-hant/System.Diagnostics.Contracts.xml", - "ref/net45/_._", - "ref/netcore50/System.Diagnostics.Contracts.dll", - "ref/netcore50/System.Diagnostics.Contracts.xml", - "ref/win8/_._", - "ref/wp80/_._", - "ref/wpa81/_._", - "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Contracts.dll" - ] - }, "System.Diagnostics.Debug/4.0.10": { "sha512": "pi2KthuvI2LWV2c2V+fwReDsDiKpNl040h6DcwFOb59SafsPT/V1fCy0z66OKwysurJkBMmp5j5CBe3Um+ub0g==", "type": "package", @@ -7408,39 +7316,6 @@ "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll" ] }, - "System.Diagnostics.StackTrace/4.0.0": { - "sha512": "PItgenqpRiMqErvQONBlfDwctKpWVrcDSW5pppNZPJ6Bpiyz+KjsWoSiaqs5dt03HEbBTMNCrZb8KCkh7YfXmw==", - "type": "package", - "path": "System.Diagnostics.StackTrace/4.0.0", - "files": [ - "System.Diagnostics.StackTrace.4.0.0.nupkg.sha512", - "System.Diagnostics.StackTrace.nuspec", - "lib/DNXCore50/System.Diagnostics.StackTrace.dll", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/net46/System.Diagnostics.StackTrace.dll", - "lib/netcore50/System.Diagnostics.StackTrace.dll", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/dotnet/System.Diagnostics.StackTrace.dll", - "ref/dotnet/System.Diagnostics.StackTrace.xml", - "ref/dotnet/de/System.Diagnostics.StackTrace.xml", - "ref/dotnet/es/System.Diagnostics.StackTrace.xml", - "ref/dotnet/fr/System.Diagnostics.StackTrace.xml", - "ref/dotnet/it/System.Diagnostics.StackTrace.xml", - "ref/dotnet/ja/System.Diagnostics.StackTrace.xml", - "ref/dotnet/ko/System.Diagnostics.StackTrace.xml", - "ref/dotnet/ru/System.Diagnostics.StackTrace.xml", - "ref/dotnet/zh-hans/System.Diagnostics.StackTrace.xml", - "ref/dotnet/zh-hant/System.Diagnostics.StackTrace.xml", - "ref/net46/System.Diagnostics.StackTrace.dll", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._", - "runtimes/win8-aot/lib/netcore50/System.Diagnostics.StackTrace.dll" - ] - }, "System.Diagnostics.Tools/4.0.0": { "sha512": "uw5Qi2u5Cgtv4xv3+8DeB63iaprPcaEHfpeJqlJiLjIVy6v0La4ahJ6VW9oPbJNIjcavd24LKq0ctT9ssuQXsw==", "type": "package", @@ -9041,7 +8916,7 @@ "projectFileDependencyGroups": { "": [ "Microsoft.NETCore >= 5.0.0", - "Microsoft.NETCore.Portable.Compatibility >= 1.0.0" + "Microsoft.NETCore.Portable.Compatibility >= 1.0.1" ], ".NETPlatform,Version=v5.0": [] } |