Skip to content

Commit

Permalink
Revert "Merge branch 'master' of https://github.com/Priscillalala/R2API"
Browse files Browse the repository at this point in the history
This reverts commit d9bdb3b, reversing
changes made to a73dfc7.
  • Loading branch information
Priscillalala committed Dec 25, 2023
1 parent d9bdb3b commit f7dfd54
Show file tree
Hide file tree
Showing 134 changed files with 818 additions and 4,484 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
dotnet-version: 7.0.x

- name: Build projects
run: dotnet build --configuration Debug /p:OutputPath=${PWD}/DebugOutput
run: dotnet build --configuration Debug --output ./DebugOutput /p:OutputPath=./DebugOutput

- name: Prepare Artifact
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
set -x
cd BuildCI
for line in $(dotnet run --configuration Release Program.cs); do
for line in $(dotnet run Program.cs); do
IFS='|' read -ra parts <<< "$line"
namespace=${parts[0]}
name_underscore_separator=${parts[1]}
Expand All @@ -44,7 +44,7 @@ jobs:
existing_version_number=$(curl --compressed -s "https://api-v2v3search-0.nuget.org/query?q=packageid:${nuget_package_name}&prerelease=true&semVerLevel=2.0.0" | jq '.data[0]?.versions[]?.version' | grep "${version}\"" || true)
if [ -z $existing_version_number ]
then
dotnet pack --configuration Release /p:PackageOutputPath=./ReleaseOutput /p:OutputPath=./ReleaseOutput
dotnet pack --configuration Release --output ./ReleaseOutput /p:OutputPath=./ReleaseOutput
is_project_built=true
if [ "$namespace" == "RiskofThunder" ]; then
Expand All @@ -61,7 +61,7 @@ jobs:
if [ -z $existing_version_number ]
then
if [ "$is_project_built" = false ] ; then
dotnet pack --configuration Release /p:PackageOutputPath=./ReleaseOutput /p:OutputPath=./ReleaseOutput
dotnet pack --configuration Release --output ./ReleaseOutput /p:OutputPath=./ReleaseOutput
is_project_built=true
fi
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,3 @@ ASALocalRun/

# Build CI
ReleaseOutput/

# Debug
All R2API Modules/
25 changes: 1 addition & 24 deletions BuildCI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
const string VersionNumberTomlKey = "versionNumber";
const string DependencyTomlKey = "dependencies";

#if DEBUG
CopyAllR2APIDllsToUniqueFolder();
return;
#endif

var packages = new Dictionary<string, R2APIPackage>();

var currentFolder = Directory.GetCurrentDirectory();
Expand Down Expand Up @@ -191,25 +186,6 @@ void AddToDependencyTree(R2APIPackage package)
Console.WriteLine(output);
}

// Util method for local debugging / building
#pragma warning disable CS8321 // Local function is declared but never used
void CopyAllR2APIDllsToUniqueFolder()
{
var r2apiSolutionFolder = new DirectoryInfo(Directory.GetCurrentDirectory()).Parent.Parent.Parent.Parent;
var allR2apiModulesDirectoryPath = Path.Join(r2apiSolutionFolder.FullName, "All R2API Modules");
Directory.CreateDirectory(allR2apiModulesDirectoryPath);
foreach (var dll in Directory.GetFiles(r2apiSolutionFolder.FullName, "R2API*.dll", SearchOption.AllDirectories).Concat(Directory.GetFiles(r2apiSolutionFolder.FullName, "R2API*.pdb", SearchOption.AllDirectories)))
if (dll.Contains("\\bin\\Debug\\netstandard2.0\\"))
{
var outputPath = Path.Combine(allR2apiModulesDirectoryPath, Path.GetFileName(dll));
Console.WriteLine(dll);
if (File.Exists(outputPath))
File.Delete(outputPath);
File.Copy(dll, outputPath);
}
}
#pragma warning restore CS8321 // Local function is declared but never used

internal class Node<T>
{
internal T Value;
Expand Down Expand Up @@ -283,3 +259,4 @@ internal void InitFullDependencyReferences(Dictionary<string, R2APIPackage> pack
public override string ToString() =>
$"{Namespace}-{Name} | Directory: {CsProjDirectoryFullPath}";
}

Loading

0 comments on commit f7dfd54

Please sign in to comment.