Skip to content

Commit ba8d6d2

Browse files
committed
Common output path.
1 parent 7d6c214 commit ba8d6d2

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ TestResults
2222
.idea
2323
launchSettings.json
2424
/SimpleTester/BenchmarkDotNet.Artifacts
25+
/artifacts

Directory.Build.props

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
3+
<PropertyGroup>
4+
5+
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
6+
7+
</PropertyGroup>
8+
</Project>

Releaser/Releaser/Program.cs

+10-14
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,8 @@ static async Task<int> MainAsync()
9494
releaseLogLines.RemoveAt(releaseLogLines.Count - 1);
9595
outputLogLines.Insert(topVersionLine + 1, "## " + newVersion);
9696
outputLogLines.Insert(topVersionLine + 1, "");
97-
if (Directory.Exists(projDir + "/BTDB/bin/Release"))
98-
Directory.Delete(projDir + "/BTDB/bin/Release", true);
99-
if (Directory.Exists(projDir + "/BTDB.SourceGenerator/bin/Release"))
100-
Directory.Delete(projDir + "/BTDB.SourceGenerator/bin/Release", true);
101-
if (Directory.Exists(projDir + "/ODbDump/bin/Release"))
102-
Directory.Delete(projDir + "/ODbDump/bin/Release", true);
97+
if (Directory.Exists(projDir + "/artifacts"))
98+
Directory.Delete(projDir + "/artifacts", true);
10399
var fileNameOfNugetToken =
104100
Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "/.nuget/token.txt";
105101
string nugetToken;
@@ -157,10 +153,10 @@ static async Task<int> MainAsync()
157153
var release2 = await client.Repository.Release.Create(btdbRepo.Id, release);
158154
Console.WriteLine("release url:");
159155
Console.WriteLine(release2.HtmlUrl);
160-
var uploadAsset = await UploadWithRetry(projDir + "/BTDB/bin/Release/", client, release2, "BTDB.zip");
156+
var uploadAsset = await UploadWithRetry(projDir + "/artifacts/bin/BTDB/Release/", client, release2, "BTDB.zip");
161157
Console.WriteLine("BTDB url:");
162158
Console.WriteLine(uploadAsset.BrowserDownloadUrl);
163-
uploadAsset = await UploadWithRetry(projDir + "/ODbDump/bin/Release/", client, release2, "ODbDump.zip");
159+
uploadAsset = await UploadWithRetry(projDir + "/artifacts/bin/ODbDump/Release/", client, release2, "ODbDump.zip");
164160
Console.WriteLine("ODbDump url:");
165161
Console.WriteLine(uploadAsset.BrowserDownloadUrl);
166162
Console.WriteLine("Press Enter for finish");
@@ -214,7 +210,7 @@ static void Build(string projDir, string newVersion, string nugetToken)
214210
var process = Process.Start(start);
215211
process!.WaitForExit();
216212
var source = projDir + "/BTDB";
217-
var releaseSources = projDir + "/BTDB/bin/Release/Sources";
213+
var releaseSources = projDir + "/artifacts/bin/BTDB/Release/Sources";
218214
foreach (var fn in Directory.GetFiles(source, "*.*", SearchOption.AllDirectories).ToList())
219215
{
220216
var relfn = fn.Substring(source.Length + 1);
@@ -224,12 +220,12 @@ static void Build(string projDir, string newVersion, string nugetToken)
224220
File.Copy(fn, releaseSources + "/" + relfn);
225221
}
226222

227-
System.IO.Compression.ZipFile.CreateFromDirectory(releaseSources, projDir + "/BTDB/bin/Release/BTDB.zip",
223+
System.IO.Compression.ZipFile.CreateFromDirectory(releaseSources, projDir + "/artifacts/bin/BTDB/Release/BTDB.zip",
228224
System.IO.Compression.CompressionLevel.Optimal, false);
229225
start = new("dotnet", "nuget push BTDB." + newVersion + ".nupkg -s https://nuget.org -k " + nugetToken)
230226
{
231227
UseShellExecute = true,
232-
WorkingDirectory = projDir + "/BTDB/bin/Release"
228+
WorkingDirectory = projDir + "/artifacts/bin/BTDB/Release"
233229
};
234230
process = Process.Start(start);
235231
process!.WaitForExit();
@@ -248,7 +244,7 @@ static void BuildSourceGenerator(string projDir, string newVersion, string nuget
248244
"nuget push BTDB.SourceGenerator." + newVersion + ".nupkg -s https://nuget.org -k " + nugetToken)
249245
{
250246
UseShellExecute = true,
251-
WorkingDirectory = projDir + "/BTDB.SourceGenerator/bin/Release"
247+
WorkingDirectory = projDir + "/artifacts/bin/BTDB.SourceGenerator/Release"
252248
};
253249
process = Process.Start(start);
254250
process!.WaitForExit();
@@ -263,9 +259,9 @@ static void BuildODbDump(string projDir)
263259
};
264260
var process = Process.Start(start);
265261
process!.WaitForExit();
266-
var source = projDir + "/ODbDump/bin/Release/net8.0/publish";
262+
var source = projDir + "/artifacts/publish/ODbDump/Release";
267263
System.IO.Compression.ZipFile.CreateFromDirectory(source,
268-
projDir + "/ODbDump/bin/Release/ODbDump.zip",
264+
projDir + "/artifacts/bin/ODbDump/Release/ODbDump.zip",
269265
System.IO.Compression.CompressionLevel.Optimal, false);
270266
}
271267
}

0 commit comments

Comments
 (0)