Skip to content

Commit

Permalink
Fixed issues with SDK style projects.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haplois
Haplois committed Aug 10, 2022
1 parent f3b5edb commit 3fa917c
Show file tree
Hide file tree
Showing 28 changed files with 78 additions and 94 deletions.
6 changes: 4 additions & 2 deletions scripts/Build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ function Invoke-MSBuild([string]$solution, $buildTarget = $Target, $hasVsixExten
"-p:IsLocalizedBuild=$TFB_IsLocalizedBuild",
"-p:UpdateXlf=$TFB_UpdateXlf",
"-p:BuildVersion=$TFB_BuildVersion",
"-p:BranchName=`"$TPB_BRANCH`"",
"-p:CommitHash=$TPB_COMMIT",
"-restore:$restore",
"`"$solutionPath`"",
"-bl:`"$binLog`"",
Expand Down Expand Up @@ -304,8 +306,8 @@ function Create-NugetPackages {
$SystemPrivateUriVersion = Get-PackageVersion -PackageName "SystemPrivateUriVersion"
$SystemXmlReaderWriterVersion = Get-PackageVersion -PackageName "SystemXmlReaderWriterVersion"

Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion``;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion``;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion``;SystemPrivateUriVersion=$SystemPrivateUriVersion``;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion``;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion``;NOWARN=`"NU5127,NU5128,NU5129`"``;BranchName=$TPB_BRANCH``;CommitId=$TPB_COMMIT"
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion`;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion`;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion`;SystemPrivateUriVersion=$SystemPrivateUriVersion`;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion`;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion`;NOWARN="NU5127,NU5128,NU5129"`;BranchName=$TPB_BRANCH`;CommitId=$TPB_COMMIT
Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion``;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion``;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion``;SystemPrivateUriVersion=$SystemPrivateUriVersion``;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion``;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion``;NOWARN=`"NU5127,NU5128,NU5129`"``;BranchName=$TPB_BRANCH``;CommitHash=$TPB_COMMIT"
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion`;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion`;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion`;SystemPrivateUriVersion=$SystemPrivateUriVersion`;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion`;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion`;NOWARN="NU5127,NU5128,NU5129"`;BranchName=$TPB_BRANCH`;CommitHash=$TPB_COMMIT
if ($lastExitCode -ne 0) {
throw "Nuget pack failed with an exit code of '$lastExitCode'."
}
Expand Down
6 changes: 6 additions & 0 deletions scripts/build/TestFx.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
<IsTest Condition=" '$(IsTest)' == '' ">false</IsTest>
</PropertyGroup>

<PropertyGroup>
<BranchName Condition=" '$(BranchName)' == '' ">BRANCHNAME</BranchName>
<CommitHash Condition=" '$(CommitHash)' == '' ">COMMITHASH</CommitHash>
<CommitId>$(CommitHash.SubString(0, 8))</CommitId>
</PropertyGroup>

<Import Project="$(RepoRoot)eng\Versions.props" />
<Import Project="$(RepoRoot)scripts\build\TestFx.Sign.props" Condition=" '$(TestFxSigningPropsImported)' != 'true' " />

Expand Down
51 changes: 36 additions & 15 deletions scripts/build/TestFx.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<Analyzer Include="$(NuGetPackageRoot)\StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
<Analyzer Include="$(NuGetPackageRoot)\StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
</ItemGroup>


<!-- WARNING remove this when SDK-style project conversion is being done. -->
<!--
Expand All @@ -36,33 +35,55 @@
<PropertyGroup>
<TFBuildNumber Condition=" '$(TFBuildNumber)' == '' ">0.1</TFBuildNumber>
<MajorVersion>14.0</MajorVersion>
<GeneratedAssemblyInfoFile Condition="'$(GeneratedAssemblyInfoFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo.cs</GeneratedAssemblyInfoFile>
<Company>Microsoft Corporation</Company>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyVersion>$(MajorVersion).0.0</AssemblyVersion>
<BuildVersion Condition=" '$(BuildVersion)' == '' ">$(MajorVersion).$(TFBuildNumber)</BuildVersion>
</PropertyGroup>

<PropertyGroup>
<GeneratedAssemblyInfoFile Condition="'$(GeneratedAssemblyInfoFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo.cs</GeneratedAssemblyInfoFile>
<FileVersion Condition=" '$(FileVersion)' == '' ">$(BuildVersion)</FileVersion>
<InformationalVersion>$(BuildVersion)+$(CommitId)</InformationalVersion>
</PropertyGroup>

<ItemGroup>
<AssemblyVersionAttribute Include="System.Reflection.AssemblyVersionAttribute">
<!-- Not including branch name assemblies for now. -->
<!-- <AssemblyMetadata Include="Branch" Value="$(BranchName)" /> -->
<AssemblyMetadata Include="Commit" Value="$(CommitHash)" />
</ItemGroup>

<ItemGroup Condition=" '$(GenerateAssemblyInfo)' == 'false' ">
<AssemblyAttribute Include="System.Reflection.AssemblyCompanyAttribute" Condition="'$(Company)' != '' and '$(GenerateAssemblyCompanyAttribute)' == 'true'">
<_Parameter1>$(Company)</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyCopyrightAttribute" Condition="'$(Copyright)' != '' and '$(GenerateAssemblyCopyrightAttribute)' == 'true'">
<_Parameter1>$(Copyright)</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute" Condition="'$(AssemblyVersion)' != ''">
<_Parameter1>$(AssemblyVersion)</_Parameter1>
</AssemblyVersionAttribute>
<AssemblyVersionAttribute Include="System.Reflection.AssemblyFileVersionAttribute">
<_Parameter1>$(BuildVersion)</_Parameter1>
</AssemblyVersionAttribute>
<AssemblyVersionAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute">
<_Parameter1>$(BuildVersion)</_Parameter1>
</AssemblyVersionAttribute>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyFileVersionAttribute" Condition="'$(FileVersion)' != ''">
<_Parameter1>$(FileVersion)</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute" Condition="'$(InformationalVersion)' != ''">
<_Parameter1>$(InformationalVersion)</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(GenerateRepositoryUrlAttribute)' != 'true'" >
<_Parameter1>RepositoryUrl</_Parameter1>
<_Parameter2 Condition="'$(RepositoryUrl)' != ''">$(RepositoryUrl)</_Parameter2>
<_Parameter2 Condition="'$(RepositoryUrl)' == ''">$(PrivateRepositoryUrl)</_Parameter2>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadata" Condition="'$(GenerateAssemblyMetadataAttributes)' != 'true'">
<_Parameter1>%(AssemblyMetadata.Identity)</_Parameter1>
<_Parameter2>%(AssemblyMetadata.Value)</_Parameter2>
</AssemblyAttribute>
</ItemGroup>

<Target Name="GenerateAssemblyInfoFile">
<Target Name="GenerateAssemblyInfoFile" Condition=" '$(GenerateAssemblyInfo)' == 'false' ">
<ItemGroup>
<!-- Ensure the generated assemblyinfo file is not already part of the Compile sources, as a workaround for https://github.com/dotnet/sdk/issues/114 -->
<Compile Remove="$(GeneratedAssemblyInfoFile)" />
</ItemGroup>

<WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)" Language="C#" OutputFile="$(GeneratedAssemblyInfoFile)" Condition=" '$(SkipAppendingVersion)' != 'true' ">
<WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)" Language="C#" OutputFile="$(GeneratedAssemblyInfoFile)">
<Output TaskParameter="OutputFile" ItemName="Compile" />
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragment>
Expand Down
3 changes: 2 additions & 1 deletion src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ private IEnumerable<UnitTestElement> DiscoverTestsInType(string assemblyFileName
try
{
typeFullName = type.FullName;
var unitTestCases = this.GetTypeEnumerator(type, assemblyFileName, discoverInternals).Enumerate(out var warningsFromTypeEnumerator);
var testTypeEnumerator = this.GetTypeEnumerator(type, assemblyFileName, discoverInternals);
var unitTestCases = testTypeEnumerator.Enumerate(out var warningsFromTypeEnumerator);
var typeIgnored = ReflectHelper.IsAttributeDefined(type, typeof(UTF.IgnoreAttribute), false);

if (warningsFromTypeEnumerator != null)
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
4 changes: 4 additions & 0 deletions src/Adapter/MSTest.CoreAdapter/ObjectModel/TestMethod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ public TestMethod(string name, string fullClassName, string assemblyName, bool i
this.IsAsync = isAsync;

var hierarchy = new string[HierarchyConstants.Levels.TotalLevelCount];
hierarchy[HierarchyConstants.Levels.ContainerIndex] = null;
hierarchy[HierarchyConstants.Levels.NamespaceIndex] = fullClassName;
hierarchy[HierarchyConstants.Levels.ClassIndex] = name;
hierarchy[HierarchyConstants.Levels.TestGroupIndex] = name;

this.hierarchy = new ReadOnlyCollection<string>(hierarchy);
}
Expand All @@ -62,6 +64,8 @@ internal TestMethod(MethodBase method, string name, string fullClassName, string
}

ManagedNameHelper.GetManagedName(method, out var managedType, out var managedMethod, out var hierarchyValues);
hierarchyValues[HierarchyConstants.Levels.ContainerIndex] = null; // This one will be set by test windows to current test project name.

this.ManagedTypeName = managedType;
this.ManagedMethodName = managedMethod;
this.hierarchy = new ReadOnlyCollection<string>(hierarchyValues);
Expand Down
39 changes: 20 additions & 19 deletions src/Adapter/MSTest.CoreAdapter/ObjectModel/UnitTestElement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,25 +229,26 @@ internal TestCase ToTestCase()
{
}

var idProvider = new TestIdProvider();
idProvider.AppendString(testCase.ExecutorUri?.ToString());
idProvider.AppendString(fileName);
if (this.TestMethod.HasManagedMethodAndTypeProperties)
{
idProvider.AppendString(this.TestMethod.ManagedTypeName);
idProvider.AppendString(this.TestMethod.ManagedMethodName);
}
else
{
idProvider.AppendString(testCase.FullyQualifiedName);
}

if (this.TestMethod.DataType != DynamicDataType.None)
{
idProvider.AppendString(testCase.DisplayName);
}

testCase.Id = idProvider.GetId();
// This code is disabled for compatibility.
// var idProvider = new TestIdProvider();
// idProvider.AppendString(testCase.ExecutorUri?.ToString());
// idProvider.AppendString(fileName);
// if (this.TestMethod.HasManagedMethodAndTypeProperties)
// {
// idProvider.AppendString(this.TestMethod.ManagedTypeName);
// idProvider.AppendString(this.TestMethod.ManagedMethodName);
// }
// else
// {
// idProvider.AppendString(testCase.FullyQualifiedName);
// }
//
// if (this.TestMethod.DataType != DynamicDataType.None)
// {
// idProvider.AppendString(testCase.DisplayName);
// }
//
// testCase.Id = idProvider.GetId();

return testCase;
}
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
32 changes: 0 additions & 32 deletions src/Adapter/PlatformServices.Desktop/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PlatformServices.Desktop")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyProduct("PlatformServices.Desktop")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b0fce474-14bc-449a-91ea-a433342c0d63")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

// This is set by GlobalAssemblyInfo which is auto-generated due to import of TestPlatform.NonRazzle.targets
// [assembly: AssemblyVersion("1.0.0.0")]
// [assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: TypeForwardedTo(typeof(SerializableAttribute))]
[assembly: TypeForwardedTo(typeof(MarshalByRefObject))]
1 change: 0 additions & 1 deletion src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>

<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>

<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down
5 changes: 0 additions & 5 deletions src/Adapter/PlatformServices.WinUI/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

[assembly: AssemblyDescription("")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]

[assembly: TypeForwardedTo(typeof(SerializableAttribute))]
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.Internal.TestFx.Documentation.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository type="git"
url="https://github.com/microsoft/testfx"
branch="$BranchName$"
commit="$CommitId$" />
commit="$CommitHash$" />
</metadata>
<files>
<!--DotNet-->
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.TestAdapter.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<repository type="git"
url="https://github.com/microsoft/testfx"
branch="$BranchName$"
commit="$CommitId$" />
commit="$CommitHash$" />

<dependencies>
<group targetFramework="netcoreapp1.0">
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.TestAdapter.symbols.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<repository type="git"
url="https://github.com/microsoft/testfx"
branch="$BranchName$"
commit="$CommitId$" />
commit="$CommitHash$" />

<dependencies>
<group targetFramework="netcoreapp1.0">
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.TestFramework.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<repository type="git"
url="https://github.com/microsoft/testfx"
branch="$BranchName$"
commit="$CommitId$" />
commit="$CommitHash$" />

<dependencies>
<group targetFramework="netstandard1.4">
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.TestFramework.symbols.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<repository type="git"
url="https://github.com/microsoft/testfx"
branch="$BranchName$"
commit="$CommitId$" />
commit="$CommitHash$" />

<dependencies>
<group targetFramework="netstandard1.4">
Expand Down
2 changes: 1 addition & 1 deletion src/Package/MSTest.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<repository type="git"
url="https://github.com/microsoft/testfx"
branch="$BranchName$"
commit="$CommitId$" />
commit="$CommitHash$" />

<dependencies>
<group targetFramework="netcoreapp1.0">
Expand Down
1 change: 0 additions & 1 deletion src/TestFramework/Extension.Core/Extension.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion src/TestFramework/Extension.UWP/Extension.UWP.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<Product>Extension.WinUI</Product>
<AssemblyTitle>Extension.WinUI</AssemblyTitle>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<SkipAppendingVersion>true</SkipAppendingVersion> <!-- TODO: remove after full arcade transition -->

<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
Expand Down
1 change: 0 additions & 1 deletion src/TestFramework/MSTest.Core/MSTest.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<!-- Remove after ARCADE transition -->
<PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>
<!-- / Remove after ARCADE transition -->
Expand Down
1 change: 0 additions & 1 deletion test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

<IsPackable>false</IsPackable>
<NoWarn>1685</NoWarn>
<SkipAppendingVersion>true</SkipAppendingVersion>
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 3fa917c

Please sign in to comment.