Refactor: Snapx dependencies will now be copied from the Snapx dotnet…

… tools directory instead of the Snapx.core nuget package.
fintermobilityas · Apr 13, 2023 · 3aa2f10 · 3aa2f10
1 parent caeab40
commit 3aa2f10
Show file tree

Hide file tree

Showing 24 changed files with 429 additions and 593 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -30,10 +30,8 @@ $WorkingDir = Split-Path -parent $MyInvocation.MyCommand.Definition
 
 $SrcDirectory = Join-Path $WorkingDir src
 $NupkgsDir = Join-Path $WorkingDir nupkgs
-$SnapSrcDir = Join-Path $SrcDirectory Snap
 $SnapxSrcDir = Join-Path $SrcDirectory Snapx
 
-$SnapCsProjPath = Join-Path $SnapSrcDir Snap.csproj
 $SnapxCsProjPath = Join-Path $SnapxSrcDir Snapx.csproj
 
 # Environment variables
@@ -134,15 +132,6 @@ function Invoke-Install-Snapx
         "snapx"
     ) -IgnoreExitCode
 
-    Invoke-Command-Colored dotnet @(
-        "build"
-        "/p:Version=$Version"
-        "/p:SnapRid=pack"
-        "/p:GeneratePackageOnBuild=true"
-        "--configuration $Configuration"
-        $SnapCsProjPath
-    )
-
     Invoke-Command-Colored dotnet @(
         "nuget add source $NupkgsDir --name snapx-local"
     ) -IgnoreExitCode

diff --git a/src/Snap.Installer.Tests/ProgramTests.cs b/src/Snap.Installer.Tests/ProgramTests.cs
@@ -101,7 +101,7 @@ public async Task TestInstall_Offline_Using_Local_PackageSource()
 
             genesisSnapReleaseBuilder
                 .AddNuspecItem(mainAssemblyDefinition)
-                .AddSnapDlls();
+                .AddSnapDll();
 
             using var genesisPackageContext = await _baseFixturePackaging.BuildPackageAsync(genesisSnapReleaseBuilder, cts.Token);
 
@@ -181,22 +181,22 @@ public async Task TestInstall_Web_Using_Local_PackageSource()
                 .AddNuspecItem(mainExecutable)
                 .AddNuspecItem(mainExecutable.BuildRuntimeConfigFilename(_snapFilesystem), mainExecutable.BuildRuntimeConfig())
                 .AddNuspecItem(_baseFixture.BuildLibrary("test1"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             update1SnapReleaseBuilder
                 .AddNuspecItem(genesisSnapReleaseBuilder, 0)
                 .AddNuspecItem(genesisSnapReleaseBuilder, 1)
                 .AddNuspecItem(genesisSnapReleaseBuilder, 2)
                 .AddNuspecItem(_baseFixture.BuildLibrary("test2"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             update2SnapReleaseBuilder
                 .AddNuspecItem(update1SnapReleaseBuilder, 0)
                 .AddNuspecItem(update1SnapReleaseBuilder, 1)
                 .AddNuspecItem(update1SnapReleaseBuilder, 2)
                 .AddNuspecItem(update1SnapReleaseBuilder, 3)
                 .AddNuspecItem(_baseFixture.BuildLibrary("test3"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             using var genesisPackageContext = await _baseFixturePackaging.BuildPackageAsync(genesisSnapReleaseBuilder, cts.Token);
             using var update1PackageContext = await _baseFixturePackaging.BuildPackageAsync(update1SnapReleaseBuilder, cts.Token);

diff --git a/src/Snap.Shared.Tests/BaseFixturePackaging.cs b/src/Snap.Shared.Tests/BaseFixturePackaging.cs
@@ -92,15 +92,10 @@ public SnapReleaseBuilder AddNuspecItem([NotNull] AssemblyDefinition assemblyDef
             return this;
         }
 
-        public SnapReleaseBuilder AddSnapDlls()
+        public SnapReleaseBuilder AddSnapDll()
         {
             var assemblyDefinition = AssemblyDefinition.ReadAssembly(typeof(SnapPack).Assembly.Location);
             _nuspec.Add(assemblyDefinition.BuildRelativeFilename(), assemblyDefinition);
-            var libPalFilename = SnapApp.GetLibPalFilename();
-            var libBsdiffFilename = SnapApp.GetLibBsdiffFilename();
-            var targetRid = SnapApp.Target.Rid;
-            _nuspec.Add(GetLibPalRelativePath(), File.OpenRead(Path.Combine(AppContext.BaseDirectory, "runtimes", targetRid, "native", libPalFilename)));
-            _nuspec.Add(GetLibBsdiffRelativePath(), File.OpenRead(Path.Combine(AppContext.BaseDirectory, "runtimes", targetRid, "native", libBsdiffFilename)));
             return this;
         }
 

diff --git a/src/Snap.Tests/Core/SnapCryptoProviderTests.cs b/src/Snap.Tests/Core/SnapCryptoProviderTests.cs
@@ -62,7 +62,7 @@ public async Task TestSha256_PackageArchiveReader_Central_Directory_Corrupt()
             using var genesisSnapReleaseBuilder = _baseFixture
                 .WithSnapReleaseBuilder(testDirectory, snapAppsReleases, genesisSnapApp, _snapReleaseBuilderContext)
                 .AddNuspecItem(_baseFixture.BuildSnapExecutable(genesisSnapApp))
-                .AddSnapDlls();
+                .AddSnapDll();
             using var genesisPackageContext = await _baseFixture.BuildPackageAsync(genesisSnapReleaseBuilder);
             Checksum(genesisPackageContext.FullPackageSnapRelease);
             Checksum(genesisPackageContext.FullPackageSnapRelease);

diff --git a/src/Snap.Tests/Core/SnapInstallerTests.cs b/src/Snap.Tests/Core/SnapInstallerTests.cs
@@ -59,7 +59,7 @@ public async Task TestInstallAsync()
                 .AddNuspecItem(mainAssemblyDefinition)
                 .AddNuspecItem(mainAssemblyDefinition.BuildRuntimeConfigFilename(_snapFilesystem), mainAssemblyDefinition.BuildRuntimeConfig())
                 .AddNuspecItem(_baseFixture.BuildLibrary("test1"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             using var genesisPackageContext = await _baseFixture.BuildPackageAsync(genesisSnapReleaseBuilder);
 
@@ -172,7 +172,7 @@ public async Task TestInstallAsync_Different_Channel()
             var mainAssemblyDefinition = _baseFixture.BuildSnapExecutable(genesisSnapApp);
             genesisSnapReleaseBuilder
                 .AddNuspecItem(mainAssemblyDefinition)
-                .AddSnapDlls();
+                .AddSnapDll();
 
             using var genesisPackageContext = await _baseFixture.BuildPackageAsync(genesisSnapReleaseBuilder);
             var loggerMock = new Mock<ILog>();
@@ -245,22 +245,22 @@ public async Task TestUpdateAsync()
                 .AddNuspecItem(mainExecutable)
                 .AddNuspecItem(mainExecutable.BuildRuntimeConfigFilename(_snapFilesystem), mainExecutable.BuildRuntimeConfig())
                 .AddNuspecItem(_baseFixture.BuildLibrary("test1"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             update1SnapReleaseBuilder
                 .AddNuspecItem(genesisSnapReleaseBuilder, 0)
                 .AddNuspecItem(genesisSnapReleaseBuilder, 1)
                 .AddNuspecItem(genesisSnapReleaseBuilder, 2)
                 .AddNuspecItem(_baseFixture.BuildLibrary("test2"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             update2SnapReleaseBuilder
                 .AddNuspecItem(update1SnapReleaseBuilder, 0)
                 .AddNuspecItem(update1SnapReleaseBuilder, 1)
                 .AddNuspecItem(update1SnapReleaseBuilder, 2)
                 .AddNuspecItem(update1SnapReleaseBuilder, 3)
                 .AddNuspecItem(_baseFixture.BuildLibrary("test3"))
-                .AddSnapDlls();
+                .AddSnapDll();
 
             using var genesisPackageContext = await _baseFixture.BuildPackageAsync(genesisSnapReleaseBuilder);
             using (await _baseFixture.BuildPackageAsync(update1SnapReleaseBuilder))