restructuring files

Xcaciv · Apr 24, 2024 · d45b75e · d45b75e
1 parent cefe0dc
commit d45b75e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/dotnet_pullrequest.yml b/.github/workflows/dotnet_pullrequest.yml
@@ -10,10 +10,7 @@ jobs:
     runs-on: windows-latest
 
     env:
-      Solution_Name: src\Xcaciv.Loader\Xcaciv.Loader.sln                         # your solution name, i.e. MyWpfApp.sln.
-      Test_Project_Path: src\Xcaciv.Loader\Xcaciv.LoaderTests\Xcaciv.LoaderTests.csproj  # path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
-      Net_Project_Directory: Xcaciv.Loader    # the Wap project directory relative to the solution, i.e. MyWpfApp.Package.
-      Net_Project_Path: src\Xcaciv.Loader\Xcaciv.Loader\Xcaciv.Loader.csproj                   # path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.
+      Solution_Name: Xcaciv.Loader.sln
 
     steps:
     - name: Checkout

diff --git a/.github/workflows/dotnet_push.yml b/.github/workflows/dotnet_push.yml
@@ -10,11 +10,9 @@ jobs:
     runs-on: windows-latest
 
     env:
-      Solution_Name: src\Xcaciv.Loader\Xcaciv.Loader.sln                         
-      Test_Project_Path: src\Xcaciv.Loader\Xcaciv.LoaderTests\Xcaciv.LoaderTests.csproj  
-      Net_Project_Directory: Xcaciv.Loader    
-      Net_Project_Path: src\Xcaciv.Loader\Xcaciv.Loader\Xcaciv.Loader.csproj                 
-      Nuget_Project_Path: src\Xcaciv.Loader\Xcaciv.Loader\Xcaciv.Loader.csproj
+      Solution_Name: Xcaciv.Loader.sln               
+      Nuget_Project_Path: src\Xcaciv.Loader\Xcaciv.Loader.csproj
+      Nuget_Config_Path: NuGet.config
 
     steps:
     - name: Checkout
@@ -26,6 +24,9 @@ jobs:
       with:
         dotnet-version: 8.0.x
 
+    - name: Configure Nuget Source
+      run: |
+        dotnet nuget update source github -s "https://nuget.pkg.github.com/xcaciv/index.json" -u xcaciv -p ${{ secrets.NUGET_PAT }} --store-password-in-clear-text --configfile $env:Nuget_Config_Path
     - name: Restore dependencies
       run: dotnet restore $env:Solution_Name
     - name: Debug Build

diff --git a/Xcaciv.Loader.sln b/Xcaciv.Loader.sln
@@ -2,13 +2,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.Loader", "Xcaciv.Loader\Xcaciv.Loader.csproj", "{741E8D5A-2AEE-42F3-92B1-55BC0DF635A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.Loader", "src\Xcaciv.Loader\Xcaciv.Loader.csproj", "{741E8D5A-2AEE-42F3-92B1-55BC0DF635A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestAssembly", "TestAssembly\zTestAssembly.csproj", "{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestAssembly", "src\TestAssembly\zTestAssembly.csproj", "{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestInterfaces", "zTestInterfaces\zTestInterfaces.csproj", "{47DF3C90-291B-4BA9-BD60-93E96FA4C05B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestInterfaces", "src\zTestInterfaces\zTestInterfaces.csproj", "{47DF3C90-291B-4BA9-BD60-93E96FA4C05B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestDependentAssembly", "zTestDependentAssembly\zTestDependentAssembly.csproj", "{81C6E4EE-E3BC-4982-94AC-DEC266530E09}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestDependentAssembly", "src\zTestDependentAssembly\zTestDependentAssembly.csproj", "{81C6E4EE-E3BC-4982-94AC-DEC266530E09}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{32657B9A-1435-43F3-BA24-B1878D8CC0B0}"
 EndProject
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.LoaderTests", "Xcaciv.LoaderTests\Xcaciv.LoaderTests.csproj", "{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.LoaderTests", "src\Xcaciv.LoaderTests\Xcaciv.LoaderTests.csproj", "{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Xcaciv.Loader/Xcaciv.Loader.csproj b/src/Xcaciv.Loader/Xcaciv.Loader.csproj
@@ -14,10 +14,12 @@
     <RepositoryUrl>https://github.com/Xcaciv/Xcaciv.Loader</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <Copyright>Alton Crossley</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <OutputType>library</OutputType>
@@ -39,12 +41,6 @@
     <Optimize>False</Optimize>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\..\..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <None Update="readme.md">
       <Pack>True</Pack>

diff --git a/src/Xcaciv.LoaderTests/AssemblyContextTests.cs b/src/Xcaciv.LoaderTests/AssemblyContextTests.cs
@@ -23,7 +23,7 @@ public AssemblyContextTests(ITestOutputHelper output)
             this.simpleDllPath = simpleDllPath.Replace("{1}", "Debug");
             this.dependentDllPath = dependentDllPath.Replace("{1}", "Debug");
 #else
-            this._testContext.WriteLine("Tests in Release mode??");
+            this._testOutput.WriteLine("Tests in Release mode??");
             this.simpleDllPath = simpleDllPath.Replace("{1}", "Release");
             this.dependentDllPath = dependentDllPath.Replace("{1}", "Release");
 #endif