Merge pull request NuGetPackageExplorer#816 from NuGetPackageExplorer…

…/preview8 Update to .NET Core 3 Preview 8
ljzms1212 · Aug 14, 2019 · 8926b45 · 8926b45
2 parents 59d14e5 + bf1c2d1
commit 8926b45
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 66 deletions.
diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -15,9 +15,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Types\Types.csproj" />    
     <PackageReference Include="AppInsights.WindowsDesktop" Version="2.10.55" />
-    <PackageReference Include="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta1-64128-01" />
+    <PackageReference Include="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-19409-01" />
     <PackageReference Include="OSVersionHelper" Version="1.0.11" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.7.0-preview7.19362.9" />    
+    <PackageReference Include="System.Reflection.Metadata" Version="1.7.0-preview8.19405.3" />    
     <Reference Include="Windows" />
   </ItemGroup>
 

diff --git a/Core/Utility/DiagnosticsClient.cs b/Core/Utility/DiagnosticsClient.cs
@@ -1,12 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
@@ -16,28 +9,20 @@ namespace NuGetPe
 {
     public static class DiagnosticsClient
     {
-        private static bool _initialized;
-
-        private static TelemetryClient  _client;
-
-
+        private static TelemetryClient?  _client;
 
         public static void Initialize()
         {
             TelemetryConfiguration.Active.TelemetryInitializers.Add(new AppVersionTelemetryInitializer());
             TelemetryConfiguration.Active.TelemetryInitializers.Add(new EnvironmentTelemetryInitializer());
 
             Application.Current.DispatcherUnhandledException += App_DispatcherUnhandledException;
-
-            _initialized = true;
-
             _client = new TelemetryClient();
         }
 
         public static void OnExit()
         {
-            if (!_initialized) return;
-
+            if (_client == null) return;
             _client.Flush();
 
             // Allow time for flushing and sending:
@@ -51,27 +36,25 @@ private static void App_DispatcherUnhandledException(object sender, System.Windo
 
         public static void TrackEvent(string eventName, IDictionary<string, string>? properties = null, IDictionary<string, double>? metrics = null)
         {
-            if (!_initialized) return;
+            if (_client == null) return;
             _client.TrackEvent(eventName, properties, metrics);
         }
 
         public static void TrackTrace(string evt, IDictionary<string, string>? properties = null)
         {
-            if (!_initialized) return;
+            if (_client == null) return;
             _client.TrackTrace(evt, properties);
         }
 
         public static void TrackException(Exception exception, IDictionary<string, string>? properties = null, IDictionary<string, double>? metrics = null)
         {
-            if (!_initialized) return;
-
+            if (_client == null) return;
             _client.TrackException(exception, properties, metrics);
         }
 
         public static void TrackPageView(string pageName)
         {
-            if (!_initialized) return;
-
+            if (_client == null) return;
             _client.TrackPageView(pageName);
         }
     }

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -40,7 +40,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19410-01" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
     <Compile Include="$(MSBuildThisFileDirectory)Common\CommonAssemblyInfo.cs" LinkBase="Properties" />
   </ItemGroup>
 

diff --git a/NuGet.config b/NuGet.config
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>    
-    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
-    <add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
-    <add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
-    <add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
-    <add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
-    <add key="NuGetBuilds" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
-
     <add key="Private NuGet" value="https://www.myget.org/F/nuget-25c07c5b-c32a-46b1-97ad/api/v3/index.json"  />
     <add key="Symreader Converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json"  />
   </packageSources>

diff --git a/PackageExplorer/MefServices/SettingsManager.cs b/PackageExplorer/MefServices/SettingsManager.cs
@@ -21,9 +21,9 @@ internal class SettingsManager : ISettingsManager, INotifyPropertyChanged
     {
         public const string ApiKeysSectionName = "apikeys";
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
-        private readonly object lockObject = new object();
+        private readonly object _lockObject = new object();
 
         private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
@@ -32,7 +32,7 @@ private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
 
         private T GetValue<T>([CallerMemberName] string? name = null)
         {
-            lock(lockObject)
+            lock(_lockObject)
             {
                 object value;
                 try
@@ -102,7 +102,7 @@ private void SetValue(object? value, string? name = null, [CallerMemberName] str
         {
             name ??= propertyName;
 
-            lock(lockObject)
+            lock(_lockObject)
             {
                 try
                 {

diff --git a/PackageExplorer/NuGetPackageExplorer.csproj b/PackageExplorer/NuGetPackageExplorer.csproj
@@ -20,8 +20,8 @@
     <PackageReference Include="Humanizer" Version="2.6.2" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="1.1.0" />
     <PackageReference Include="System.Memory" Version="4.5.3" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview7.19362.9" />
-    <PackageReference Include="System.Runtime.Caching" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview8.19405.3" />
+    <PackageReference Include="System.Runtime.Caching" Version="4.6.0-preview8.19405.3" />
 
     <Reference Include="Windows" />
 

diff --git a/PackageViewModel/Commands/SavePackageCommand.cs b/PackageViewModel/Commands/SavePackageCommand.cs
@@ -46,7 +46,7 @@ public bool CanExecute(object parameter)
             return !isSigned && !hasTokens && !ViewModel.IsInEditFileMode;
         }
 
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler? CanExecuteChanged;
 
         public void Execute(object parameter)
         {

diff --git a/PackageViewModel/EditableFrameworkAssemblyReference.cs b/PackageViewModel/EditableFrameworkAssemblyReference.cs
@@ -41,7 +41,7 @@ public IEnumerable<NuGetFramework> SupportedFrameworks
 
         #region INotifyPropertyChanged Members
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         #endregion
 

diff --git a/PackageViewModel/EditableFrameworkReferenceGroup.cs b/PackageViewModel/EditableFrameworkReferenceGroup.cs
@@ -21,7 +21,7 @@ public EditableFrameworkReferenceGroup(FrameworkReferenceGroup frameworkReferenc
             FrameworkReferences = new ObservableCollection<string>(frameworkReferenceGroup.FrameworkReferences.Select(fr => fr.Name));
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public NuGetFramework? TargetFramework
         {

diff --git a/PackageViewModel/EditablePackageDependency.cs b/PackageViewModel/EditablePackageDependency.cs
@@ -60,8 +60,6 @@ public string? Exclude
             }
         }
 
-        #region IDataErrorInfo Members
-
         public string? Error
         {
             get { return null; }
@@ -72,13 +70,7 @@ public string? this[string columnName]
             get { return IsValid(columnName); }
         }
 
-        #endregion
-
-        #region INotifyPropertyChanged Members
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        #endregion
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         private void RaisePropertyChange(string propertyName)
         {

diff --git a/PackageViewModel/EditablePackageDependencySet.cs b/PackageViewModel/EditablePackageDependencySet.cs
@@ -47,7 +47,7 @@ public PackageDependencyGroup AsReadOnly()
             return new PackageDependencyGroup(TargetFramework ?? NuGetFramework.AnyFramework, Dependencies);
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         private void OnPropertyChange(string propertyName)
         {

diff --git a/PackageViewModel/EditablePackageMetadata.cs b/PackageViewModel/EditablePackageMetadata.cs
@@ -269,7 +269,7 @@ public string? this[string columnName]
 
         #region INotifyPropertyChanged Members
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
         private bool _developmentDependency;
         private RepositoryMetadata? _repository;
         private LicenseMetadata? _licenseMetadata;

diff --git a/PackageViewModel/EditablePackageReferenceSet.cs b/PackageViewModel/EditablePackageReferenceSet.cs
@@ -20,7 +20,7 @@ public EditablePackageReferenceSet(PackageReferenceSet packageReferenceSet)
             References = new ObservableCollection<string>(packageReferenceSet.References);
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         public NuGetFramework? TargetFramework
         {

diff --git a/PackageViewModel/PackagePart/SortedCollection.cs b/PackageViewModel/PackagePart/SortedCollection.cs
@@ -94,15 +94,11 @@ IEnumerator IEnumerable.GetEnumerator()
 
         #region INotifyCollectionChanged Members
 
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public event NotifyCollectionChangedEventHandler? CollectionChanged;
 
         #endregion
 
-        #region INotifyPropertyChanged Members
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        #endregion
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         private int IndexOf(T item)
         {

diff --git a/PackageViewModel/PackageSearch/LocalPackageSearcher.cs b/PackageViewModel/PackageSearch/LocalPackageSearcher.cs
@@ -6,7 +6,7 @@
 
 namespace PackageExplorerViewModel.PackageSearch
 {
-    class LocalPackageSearcher<T> where T : IPackageSearchMetadata
+    internal class LocalPackageSearcher<T> where T : IPackageSearchMetadata
     {
         private readonly SearchContext _searchContext;
 
@@ -29,7 +29,7 @@ public IEnumerable<T> SearchPackages(IEnumerable<T> packages)
             {
                 packages = packages.Where(p => string.Equals(p.Identity.Id, searchText, StringComparison.OrdinalIgnoreCase));
             }
-            else if (!String.IsNullOrEmpty(searchText))
+            else if (!string.IsNullOrEmpty(searchText))
             {
                 // Support multiple terms
                 var searchValues = SplitValues(searchText, " ");

diff --git a/PackageViewModel/PackageViewModel.csproj b/PackageViewModel/PackageViewModel.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Web.Xdt" Version="2.1.2" /> 
     <PackageReference Include="NuGet.Commands" Version="5.3.0-xprivate.60011" />
     <PackageReference Include="NuGet.Resolver" Version="5.3.0-xprivate.60011" />
-    <PackageReference Include="System.Windows.Extensions" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.Windows.Extensions" Version="4.6.0-preview8.19405.3" />
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
 

diff --git a/Types/Types.csproj b/Types/Types.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <!--<PackageReference Include="Microsoft.Web.Xdt" Version="3.0.0" />-->
     <PackageReference Include="NuGet.Packaging" Version="5.3.0-xprivate.60011" />
-    <PackageReference Include="System.ComponentModel.Composition" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="4.6.0-preview8.19405.3" />
   </ItemGroup>
 
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,7 +28,7 @@ jobs:
   steps:
   - task: DotNetCoreInstaller@0
     inputs:
-      version: '3.0.100-preview7-012821'
+      version: '3.0.100-preview8-013656'
 
   - task: DotNetCoreCLI@2
     inputs: