Merge branch 'main' into darc-main-6165edfb-dded-45cd-907f-8ca5bdb0cf6c

xamarin · Jun 21, 2024 · 268ad68 · 268ad68
2 parents 10d99e8 + e15955b
commit 268ad68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tools/devops/automation/scripts/VSTS.Tests.ps1 b/tools/devops/automation/scripts/VSTS.Tests.ps1
@@ -238,7 +238,8 @@ Describe 'New-BuildConfiguration' {
   ""tvos-arm64_NUGET_RUNTIME_NAME"": null,
   ""Commit"": ""BUILD_SOURCEVERSION"",
   ""Tags"": [
-    ""ciBuild""
+    ""ciBuild"",
+    ""BUILD_SOURCEBRANCHNAME""
   ]
 }"
         }
@@ -281,7 +282,8 @@ Describe 'New-BuildConfiguration' {
   ""tvos-arm64_NUGET_RUNTIME_NAME"": null,
   ""Commit"": ""BUILD_SOURCEVERSION"",
   ""Tags"": [
-    ""ciBuild""
+    ""ciBuild"",
+    ""BUILD_SOURCEBRANCHNAME""
   ]
 }
 "

diff --git a/tools/siminstaller/Makefile b/tools/siminstaller/Makefile
@@ -9,7 +9,7 @@ install-local:: all-local
 
 # we build using the system .NET, because we might execute before we've downloaded our own version of .NET (i.e. while provisioning dependencies)
 $(EXECUTABLE): $(wildcard *.cs) $(wildcard *.csproj) Makefile
-	$(Q_BUILD) cd $(HOME) && dotnet build $(abspath $(CURDIR))/*.csproj "/bl:$@.binlog" $(DOTNET_BUILD_VERBOSITY)
+	$(Q_BUILD) cd $(HOME) && dotnet build $(abspath $(CURDIR))/*.csproj "/bl:$(abspath $@.binlog)" $(DOTNET_BUILD_VERBOSITY)
 	$(Q) touch $@
 
 print-simulators: $(EXECUTABLE)