diff --git a/docs/Directory.Build.props b/docs/Directory.Build.props
new file mode 100644
index 00000000000..d8bc06bec07
--- /dev/null
+++ b/docs/Directory.Build.props
@@ -0,0 +1,6 @@
+
+
+
+ false
+
+
diff --git a/scripts/benchmarks_ci.py b/scripts/benchmarks_ci.py
index 9f51ebf73fa..9915865ab7f 100755
--- a/scripts/benchmarks_ci.py
+++ b/scripts/benchmarks_ci.py
@@ -157,7 +157,6 @@ def __is_valid_datetime(dt: str) -> str:
action='store_true',
help='Attempts to run the benchmarks without building.',
)
-
return parser
@@ -171,7 +170,6 @@ def __process_arguments(args: list):
add_arguments(parser)
return parser.parse_args(args)
-
def __main(args: list) -> int:
validate_supported_runtime()
args = __process_arguments(args)
@@ -270,6 +268,5 @@ def __main(args: list) -> int:
upload.upload(globpath, upload_container, UPLOAD_QUEUE, UPLOAD_TOKEN_VAR, UPLOAD_STORAGE_URI)
# TODO: Archive artifacts.
-
if __name__ == "__main__":
__main(sys.argv[1:])
diff --git a/scripts/micro_benchmarks.py b/scripts/micro_benchmarks.py
index a5338166619..9632ebf4cbb 100755
--- a/scripts/micro_benchmarks.py
+++ b/scripts/micro_benchmarks.py
@@ -313,8 +313,7 @@ def run(
verbose,
*run_args
)
-
-
+
def __log_script_header(message: str):
getLogger().info('-' * len(message))
getLogger().info(message)
@@ -361,7 +360,6 @@ def __main(args: list) -> int:
verbose,
args
)
-
return 0
except CalledProcessError as ex:
getLogger().error(
diff --git a/scripts/performance/common.py b/scripts/performance/common.py
index f60f83f647e..517e01f25d6 100644
--- a/scripts/performance/common.py
+++ b/scripts/performance/common.py
@@ -80,6 +80,12 @@ def helixpayload():
'''
return environ.get('HELIX_CORRELATION_PAYLOAD')
+def helixuploadroot():
+ '''
+ Returns the helix upload root. Will be None outside of helix.
+ '''
+ return environ.get('HELIX_WORKITEM_UPLOAD_ROOT')
+
def runninginlab():
return environ.get('PERFLAB_INLAB') is not None
diff --git a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs
index 631903b8f2f..5c50eb7c55f 100644
--- a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs
+++ b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs
@@ -81,6 +81,7 @@ public void SetupWriteAllBytes()
public void WriteAllBytes(int size) => File.WriteAllBytes(_testFilePath, _userBuffers[size]);
#if !NETFRAMEWORK
+ [BenchmarkCategory(Categories.NoWASM)]
[Benchmark]
[Arguments(HalfKibibyte)]
[Arguments(FourKibibytes)]
diff --git a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs
index 89b1d6cb23b..73e83ae19d7 100644
--- a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs
+++ b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs
@@ -322,6 +322,7 @@ public void Flush(long fileSize, FileOptions options)
}
}
+ [BenchmarkCategory(Categories.NoWASM)]
[Benchmark]
[Arguments(OneKibibyte, FileOptions.None)]
[Arguments(OneKibibyte, FileOptions.Asynchronous)]
diff --git a/src/benchmarks/micro/wasm/nuget.config b/src/benchmarks/micro/wasm/nuget.config
new file mode 100644
index 00000000000..9d95cfa5923
--- /dev/null
+++ b/src/benchmarks/micro/wasm/nuget.config
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj b/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
index 8e63fff3c3e..6d970daddc8 100644
--- a/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
+++ b/src/harness/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
@@ -7,7 +7,7 @@
<_BenchmarkDotNetSourcesN>$([MSBuild]::NormalizeDirectory('$(BenchmarkDotNetSources)'))
-
+
diff --git a/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs b/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs
index 40aa5f87fbe..ba00c76d01f 100644
--- a/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs
+++ b/src/harness/BenchmarkDotNet.Extensions/RecommendedConfig.cs
@@ -37,7 +37,7 @@ public static IConfig Create(
.DontEnforcePowerPlan(); // make sure BDN does not try to enforce High Performance power plan on Windows
// See https://github.com/dotnet/roslyn/issues/42393
- job = job.WithArguments(new Argument[] { new MsBuildArgument("/p:DebugType=portable") });
+ job = job.WithArguments(new Argument[] { new MsBuildArgument("/p:DebugType=portable"), new MsBuildArgument("-bl:benchmarkdotnet.binlog") });
}
var config = ManualConfig.CreateEmpty()