diff --git a/corefxlab-base.yml b/corefxlab-base.yml
index 8e86f4e07..9fcc2fd4c 100644
--- a/corefxlab-base.yml
+++ b/corefxlab-base.yml
@@ -46,7 +46,7 @@ jobs:
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
- name: _buildArguments
- value: -Configuration $(_BuildConfig) -ci -sign /p:BuildPackages=true -pack -publish $(_InternalBuildArgs)
+ value: -Configuration $(_BuildConfig) -ci -sign -pack -publish $(_InternalBuildArgs)
- name: _SignType
value: real
- group: DotNet-MyGet-Publish
@@ -60,7 +60,7 @@ jobs:
- ${{ if eq(parameters.isOfficialBuild, 'false') }}:
- name: _buildArguments
- value: -Configuration $(_BuildConfig)
+ value: -Configuration $(_BuildConfig) -test -ci -pack
pool: ${{ parameters.pool }}
diff --git a/eng/Tests.ruleset b/eng/Tests.ruleset
new file mode 100644
index 000000000..5044a3ae7
--- /dev/null
+++ b/eng/Tests.ruleset
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 6b6e0d483..8718366f4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -14,7 +14,6 @@
4.5.1
1.9.1
15.0.0
- 2.2.0
0.11.3
1.0.0
2.5.2
diff --git a/tests/ALCProxy.Tests/ALCProxy.Tests.csproj b/tests/ALCProxy.Tests/ALCProxy.Tests.csproj
index a679caee9..456769feb 100644
--- a/tests/ALCProxy.Tests/ALCProxy.Tests.csproj
+++ b/tests/ALCProxy.Tests/ALCProxy.Tests.csproj
@@ -7,5 +7,6 @@
+
\ No newline at end of file
diff --git a/tests/ALCProxy.Tests/ALCProxyTests.cs b/tests/ALCProxy.Tests/ALCProxyTests.cs
index 2b246ed38..a4bdac45f 100644
--- a/tests/ALCProxy.Tests/ALCProxyTests.cs
+++ b/tests/ALCProxy.Tests/ALCProxyTests.cs
@@ -170,15 +170,11 @@ namespace ALCProxy.Tests
}
public class ALCProxyTests
{
- private readonly string _dbgString;
-
- public ALCProxyTests () {
-#if DEBUG
- _dbgString = "Debug";
-#else
- _dbgString = "Release";
-#endif
+ private readonly string _testAssemblyPath;
+ public ALCProxyTests ()
+ {
+ _testAssemblyPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ALCProxy.TestAssembly.dll");
}
[Fact]
@@ -310,18 +306,8 @@ namespace ALCProxy.Tests
[Fact]
public void CanLoadOustideAssemblyWithSharedInterface()
{
- string pathOfCurrentString = "ALCProxy.Tests";
- string assemblyLocation = Assembly.GetExecutingAssembly().Location;
- string newPath = Path.Combine(
- new string[] {
- assemblyLocation.Substring(0, assemblyLocation.IndexOf(pathOfCurrentString)),
- "ALCProxy.TestAssembly",
- "bin",
- _dbgString,
- "netcoreapp3.0",
- "ALCProxy.TestAssembly.dll" });
- TestAssemblyLoadContext alc = new TestAssemblyLoadContext("CanLoadOustideAssemblyWithSharedInterface", newPath, isCollectible: true);
- ALCProxy.TestInterface.IExternalClass a = ProxyBuilder.CreateInstanceAndUnwrap(alc, Assembly.LoadFile(newPath).GetName(true), "ExternalClass", new object[] { });
+ TestAssemblyLoadContext alc = new TestAssemblyLoadContext("CanLoadOustideAssemblyWithSharedInterface", _testAssemblyPath, isCollectible: true);
+ ALCProxy.TestInterface.IExternalClass a = ProxyBuilder.CreateInstanceAndUnwrap(alc, Assembly.LoadFile(_testAssemblyPath).GetName(true), "ExternalClass", new object[] { });
Assert.Equal(5, a.GetUserParameter(5));
Assert.Equal("CanLoadOustideAssemblyWithSharedInterface", a.GetCurrentContext());
Dictionary dict = new Dictionary
@@ -343,18 +329,8 @@ namespace ALCProxy.Tests
[Fact]
public void CanLoadOustideAssemblyWithoutSharedInterface()
{
- string pathOfCurrentString = "ALCProxy.Tests";
- string assemblyLocation = Assembly.GetExecutingAssembly().Location;
- string newPath = Path.Combine(
- new string[] {
- assemblyLocation.Substring(0, assemblyLocation.IndexOf(pathOfCurrentString)),
- "ALCProxy.TestAssembly",
- "bin",
- _dbgString,
- "netcoreapp3.0",
- "ALCProxy.TestAssembly.dll" });
- TestAssemblyLoadContext alc = new TestAssemblyLoadContext("CanLoadOustideAssemblyWithoutSharedInterface", newPath, isCollectible: true);
- ALCProxy.TestInterfaceUpdated.IExternalClass a = ProxyBuilder.CreateInstanceAndUnwrap(alc, Assembly.LoadFile(newPath).GetName(true), "ExternalClass", new object[] { });
+ TestAssemblyLoadContext alc = new TestAssemblyLoadContext("CanLoadOustideAssemblyWithoutSharedInterface", _testAssemblyPath, isCollectible: true);
+ ALCProxy.TestInterfaceUpdated.IExternalClass a = ProxyBuilder.CreateInstanceAndUnwrap(alc, Assembly.LoadFile(_testAssemblyPath).GetName(true), "ExternalClass", new object[] { });
Assert.Equal(5, a.GetUserParameter(5));
Assert.Equal("CanLoadOustideAssemblyWithoutSharedInterface", a.GetCurrentContext());
Dictionary dict = new Dictionary
diff --git a/tests/Benchmarks/Benchmarks.csproj b/tests/Benchmarks/Benchmarks.csproj
index 07fbd7841..9f0c6d7db 100644
--- a/tests/Benchmarks/Benchmarks.csproj
+++ b/tests/Benchmarks/Benchmarks.csproj
@@ -31,7 +31,7 @@
-
+
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 305e7016a..157934ce8 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -3,4 +3,7 @@
true
+
+ $(RepositoryEngineeringDir)Tests.ruleset
+
\ No newline at end of file
diff --git a/tests/System.Buffers.Primitives.Tests/UsageScenarioTests.cs b/tests/System.Buffers.Primitives.Tests/UsageScenarioTests.cs
index 6836d8a9e..dcd2a44dd 100644
--- a/tests/System.Buffers.Primitives.Tests/UsageScenarioTests.cs
+++ b/tests/System.Buffers.Primitives.Tests/UsageScenarioTests.cs
@@ -41,8 +41,6 @@ namespace System.Slices.Tests
Span span = new Span(array);
Assert.Equal(array.Length, span.Length);
- Assert.NotSame(array, span.ToArray());
-
for (int i = 0; i < span.Length; i++)
{
Assert.Equal(array[i], Read(span.Slice(i)));
@@ -76,8 +74,6 @@ namespace System.Slices.Tests
ReadOnlySpan span = new ReadOnlySpan(array);
Assert.Equal(array.Length, span.Length);
- Assert.NotSame(array, span.ToArray());
-
for (int i = 0; i < span.Length; i++)
{
Assert.Equal(array[i], Read(span.Slice(i)));
diff --git a/tests/System.Memory.Polyfill.Tests/System.Memory.Polyfill.Tests.csproj b/tests/System.Memory.Polyfill.Tests/System.Memory.Polyfill.Tests.csproj
index 7103b9ad8..cb89921c4 100644
--- a/tests/System.Memory.Polyfill.Tests/System.Memory.Polyfill.Tests.csproj
+++ b/tests/System.Memory.Polyfill.Tests/System.Memory.Polyfill.Tests.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.0;netcoreapp3.0
+ netcoreapp3.0