Dep upgrade + Feeds secret fix.

CK-Build · Nov 5, 2019 · dcaa5e9 · dcaa5e9
1 parent 043eaee
commit dcaa5e9
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -255,3 +255,4 @@ Tests/**/TestResult*.xml
 /Tests/A1Test/
 /Tests/**/Logs/
 /Tests/CK.Env.Tests/UniverseZips/
+/CodeCakeBuilder/MemoryKey.*.txt
diff --git a/CK.Artifact.Model/CK.Artifact.Model.csproj b/CK.Artifact.Model/CK.Artifact.Model.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="CSemVer" Version="7.0.1" />
-    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="11.1.3--0019-develop" />
+    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="12.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/CK.Env.Artifact.NuGet/CK.Env.Artifact.NuGet.csproj b/CK.Env.Artifact.NuGet/CK.Env.Artifact.NuGet.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Credentials" Version="5.3.0" />
-    <PackageReference Include="NuGet.Protocol" Version="5.3.0" />
+    <PackageReference Include="NuGet.Credentials" Version="5.3.1" />
+    <PackageReference Include="NuGet.Protocol" Version="5.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CK.Env.Command/CK.Env.Command.csproj b/CK.Env.Command/CK.Env.Command.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="11.1.3--0019-develop" />
+    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="12.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/CK.Env.DependencyModel/CK.Env.DependencyModel.csproj b/CK.Env.DependencyModel/CK.Env.DependencyModel.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.Setup.Dependency" Version="8.2.2--0019-develop" />
+    <PackageReference Include="CK.Setup.Dependency" Version="9.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CK.Env.Sys/CK.Env.Sys.csproj b/CK.Env.Sys/CK.Env.Sys.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="CSemVer" Version="7.0.1" />
-    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="11.1.3--0019-develop" />
+    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="12.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/CK.Xml.Linq.Extension/CK.Xml.Linq.Extension.csproj b/CK.Xml.Linq.Extension/CK.Xml.Linq.Extension.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="11.1.3--0019-develop" />
+    <PackageReference Include="CK.ActivityMonitor.SimpleSender" Version="12.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/CKli/Program.cs b/CKli/Program.cs
@@ -220,7 +220,11 @@ string FirstPadding( int paddingSize, string sourceProviderName, bool missing )
             {
                 bool provided = !string.IsNullOrWhiteSpace( sourceProviderName );
                 if( missing && provided ) throw new InvalidOperationException( "Cannot be both missing and provided" );
-                if( missing ) sourceProviderName = "Missing";
+                if( missing )
+                {
+                    sourceProviderName = "Missing";
+                    provided = true;
+                }
 
                 return provided
                     ? $"[{sourceProviderName}]" + new string( ' ', paddingSize - sourceProviderName.Length )
@@ -261,7 +265,7 @@ void RightArrow()
             foreach( var k in v.KeyStore.Infos )
             {
                 if( k.SuperKey != null ) continue;
-                Console.ForegroundColor = k.IsSecretAvailable ? (!string.IsNullOrWhiteSpace( k.SourceProviderName ) ? ConsoleColor.Blue : ConsoleColor.Green) : ConsoleColor.Red;
+                Console.ForegroundColor = k.IsSecretAvailable ? (!string.IsNullOrWhiteSpace( k.SourceProviderName ) ? ConsoleColor.Cyan : ConsoleColor.Green) : ConsoleColor.Red;
                 Console.Write( FirstPadding( sourceNameMaxLength, k.SourceProviderName, !k.IsSecretAvailable ) );
                 WhitePipe();
                 Console.WriteLine( k.Name );
@@ -277,7 +281,7 @@ void RightArrow()
                 {
                     if( sub.IsSecretAvailable )
                     {
-                        Console.ForegroundColor = displayedAvailable ? (!string.IsNullOrWhiteSpace( sub.SourceProviderName ) ? ConsoleColor.Blue : ConsoleColor.DarkGreen) : ConsoleColor.Green;
+                        Console.ForegroundColor = displayedAvailable ? (!string.IsNullOrWhiteSpace( sub.SourceProviderName ) ? ConsoleColor.Cyan : ConsoleColor.DarkGreen) : ConsoleColor.Green;
                         displayedAvailable = true;
                     }
                     else

diff --git a/CodeCakeBuilder/CodeCakeBuilder.csproj b/CodeCakeBuilder/CodeCakeBuilder.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -11,12 +11,12 @@
     <PackageReference Include="Cake.Npm" Version="0.17.0" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="NuGet.Credentials" Version="5.3.0" />
-    <PackageReference Include="NuGet.Protocol" Version="5.3.0" />
+    <PackageReference Include="NuGet.Credentials" Version="5.3.1" />
+    <PackageReference Include="NuGet.Protocol" Version="5.3.1" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
     <PackageReference Include="NUnit.Runners.Net4" Version="2.6.4" />
     <PackageReference Include="SimpleGitVersion.Cake" Version="1.0.1" />
-    <PackageReference Include="CKSetup.Cake" Version="10.0.0-a00-00-0036-develop" />
+    <PackageReference Include="CKSetup.Cake" Version="10.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Plugins/CK.Env.Plugin.CKSetup/CK.Env.Plugin.CKSetup.csproj b/Plugins/CK.Env.Plugin.CKSetup/CK.Env.Plugin.CKSetup.csproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\CK.Env.Plugin.Basics\CK.Env.Plugin.Basics.csproj" />
     <ProjectReference Include="..\..\CK.Env.XTyping\CK.Env.XTyping.csproj" />
     <ProjectReference Include="..\..\CK.SimpleKeyVault\CK.SimpleKeyVault.csproj" />
-    <PackageReference Include="CKSetup.Core" Version="10.0.0-a00-00-0036-develop" />
+    <PackageReference Include="CKSetup.Core" Version="10.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMAzureRepository.cs b/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMAzureRepository.cs
@@ -58,9 +58,10 @@ class NPMAzureRepository : NPMRepositoryBase, INPMAzureRepository
         /// </summary>
         public override string SecretKeyName => AzureDevOpsAPIHelper.GetSecretKeyName( Organization );
 
-        protected override Registry CreateRegistry( IActivityMonitor m )
+        protected override Registry CreateRegistry( IActivityMonitor m, bool throwOnError )
         {
-            string pat = ResolveSecret( m, true );
+            string pat = ResolveSecret( m, throwOnError );
+            if( string.IsNullOrWhiteSpace( pat ) ) return null;
             return new Registry( Client.HttpClient, "CKli", pat, new Uri( Url ) );
         }
 

diff --git a/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMClient.cs b/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMClient.cs
@@ -114,8 +114,8 @@ public IArtifactRepository CreateRepository( in XElementReader r )
             return new NPMFeed( scope, url, creds, () =>
             {
                 Registry registry =
-                    repositories.OfType<NPMAzureRepository>().FirstOrDefault( repo => repo.Scope == scope )?.GetRegistry( m )
-                    ?? repositories.OfType<NPMStandardRepository>().FirstOrDefault( repo => repo.Url.Equals( url, StringComparison.OrdinalIgnoreCase ) )?.GetRegistry( m );
+                    repositories.OfType<NPMAzureRepository>().FirstOrDefault( repo => repo.Scope == scope )?.GetRegistry( m, false )
+                    ?? repositories.OfType<NPMStandardRepository>().FirstOrDefault( repo => repo.Url.Equals( url, StringComparison.OrdinalIgnoreCase ) )?.GetRegistry( m, false );
                 if( registry != null ) return registry;
 
                 string secret = creds.IsSecretKeyName ?

diff --git a/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMRepositoryBase.cs b/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMRepositoryBase.cs
@@ -63,16 +63,17 @@ abstract class NPMRepositoryBase
         public bool HandleArtifactType( in ArtifactType artifactType ) => artifactType == NPMClient.NPMType;
 
         /// <summary>
-        /// Resolves the target NPM registry. Never null.
+        /// Resolves the target NPM registry.
         /// </summary>
-        public Registry GetRegistry( IActivityMonitor m ) => _registry ?? (_registry = CreateRegistry( m ));
+        public Registry GetRegistry( IActivityMonitor m, bool throwOnError = true ) => _registry ?? (_registry = CreateRegistry( m, throwOnError ));
 
         /// <summary>
-        /// Creates the registry or throws on error.
+        /// Creates the registry.
         /// </summary>
         /// <param name="m">The monitor to use.</param>
+        /// <param name="throwOnError">If true, throw when the <see cref="Registry"/> cannot be instantied.</param>
         /// <returns>The initialized registry.</returns>
-        protected abstract Registry CreateRegistry( IActivityMonitor m );
+        protected abstract Registry CreateRegistry( IActivityMonitor m, bool throwOnError );
 
         /// <summary>
         /// Overridden to return the <see cref="UniqueRepositoryName"/> string.
@@ -111,7 +112,7 @@ public virtual string ResolveSecret( IActivityMonitor m, bool throwOnEmpty = fal
         /// <returns>True if found, false otherwise.</returns>
         public virtual Task<bool> ExistsAsync( IActivityMonitor m, string packageId, SVersion version )
         {
-            return GetRegistry( m ).ExistAsync( m, packageId, version );
+            return GetRegistry( m, true ).ExistAsync( m, packageId, version );
         }
 
         /// <summary>
@@ -129,7 +130,7 @@ async Task<bool> PushPackagesAsync( IActivityMonitor m, IEnumerable<LocalNPMPack
                 var pushed = new List<LocalNPMPackageFile>();
                 foreach( LocalNPMPackageFile file in files )
                 {
-                    if( await GetRegistry( m ).ExistAsync( m, file.Instance.Artifact.Name, file.Instance.Version ) )
+                    if( await GetRegistry( m, true ).ExistAsync( m, file.Instance.Artifact.Name, file.Instance.Version ) )
                     {
                         m.Info( $"Package '{file.Instance}' already in '{ToString()}'. Push skipped." );
                         skipped.Add( file );
@@ -139,7 +140,7 @@ async Task<bool> PushPackagesAsync( IActivityMonitor m, IEnumerable<LocalNPMPack
                         string firstDistTag = file.Instance.Version.PackageQuality.GetLabels()[0].ToString();
                         using( FileStream fileStream = File.OpenRead( file.FullPath ) )
                         {
-                            if( GetRegistry( m ).Publish( m,
+                            if( GetRegistry( m, true ).Publish( m,
                                     tarballPath: file.FullPath,
                                     isPublic: arePublicArtifacts,
                                     scope: file.PackageScope,
@@ -160,7 +161,7 @@ async Task<bool> PushPackagesAsync( IActivityMonitor m, IEnumerable<LocalNPMPack
                     {
                         foreach( var label in file.Instance.Version.PackageQuality.GetLabels().Skip( 1 ) )
                         {
-                            success &= await GetRegistry( m ).AddDistTag( m, file.Instance.Artifact.Name, file.Instance.Version, label.ToString() );
+                            success &= await GetRegistry( m, true ).AddDistTag( m, file.Instance.Artifact.Name, file.Instance.Version, label.ToString() );
                         }
                     }
                     if( success )

diff --git a/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMStandardRepository.cs b/Plugins/CK.Env.Plugin.NPM/ArtifactRepository/NPMStandardRepository.cs
@@ -29,12 +29,14 @@ class NPMStandardRepository : NPMRepositoryBase, INPMStandardRepository
         /// </summary>
         public bool UsePassword { get; }
 
-        protected override Registry CreateRegistry( IActivityMonitor m )
+        protected override Registry CreateRegistry( IActivityMonitor m, bool throwOnError )
         {
             var u = new Uri( Url );
+            string secret = ResolveSecret( m, throwOnError );
+            if( secret == null ) return null;
             return UsePassword
-                    ? new Registry( Client.HttpClient, "CKli", ResolveSecret( m, true ), u )
-                    : new Registry( Client.HttpClient, ResolveSecret( m, true ), u );
+                    ? new Registry( Client.HttpClient, "CKli", secret, u )
+                    : new Registry( Client.HttpClient, secret, u );
         }
     }
 }
diff --git a/Plugins/CK.Env.Plugin.NPM/Registry.cs b/Plugins/CK.Env.Plugin.NPM/Registry.cs
@@ -417,7 +417,7 @@ async Task<bool> LogErrors( IActivityMonitor m, HttpResponseMessage res )
                         }
                         else
                         {
-                            m.Error( "Unable to authenticate, need: " + string.Join( ",", auth ) );
+                            m.Error( "Unable to authenticate, need: " + string.Join( ", ", auth ) );
                         }
                     }
                     else

diff --git a/Tests/CK.Env.Artifact.Tests/CK.Env.Artifact.Tests.csproj b/Tests/CK.Env.Artifact.Tests/CK.Env.Artifact.Tests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
   </ItemGroup>
 

diff --git a/Tests/CK.Env.FileSystem.Tests/CK.Env.FileSystem.Tests.csproj b/Tests/CK.Env.FileSystem.Tests/CK.Env.FileSystem.Tests.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview9.19423.4" />
     <PackageReference Include="FluentAssertions" Version="5.9.0" />

diff --git a/Tests/CK.Env.MSBuildSln.Tests/CK.Env.MSBuildSln.Tests.csproj b/Tests/CK.Env.MSBuildSln.Tests/CK.Env.MSBuildSln.Tests.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

diff --git a/Tests/CK.Env.Tests/CK.Env.Tests.csproj b/Tests/CK.Env.Tests/CK.Env.Tests.csproj
@@ -6,7 +6,7 @@
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

diff --git a/Tests/CK.Env.XTyping.Tests/CK.Env.XTyping.Tests.csproj b/Tests/CK.Env.XTyping.Tests/CK.Env.XTyping.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/CK.SimpleKeyVault.Tests/CK.SimpleKeyVault.Tests.csproj b/Tests/CK.SimpleKeyVault.Tests/CK.SimpleKeyVault.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />

diff --git a/Tests/CK.Xml.Linq.Extension.Tests/CK.Xml.Linq.Extension.Tests.csproj b/Tests/CK.Xml.Linq.Extension.Tests/CK.Xml.Linq.Extension.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

diff --git a/Tests/Npm.Net.Tests/Npm.Net.Tests.csproj b/Tests/Npm.Net.Tests/Npm.Net.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CK.Testing.Monitoring" Version="0.11.1--0021-develop" />
+    <PackageReference Include="CK.Testing.Monitoring" Version="0.13.0" />
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />