Skip to content

Commit 3fa917c

Browse files
HaploisHaplois
committed
Fixed issues with SDK style projects.
1 parent f3b5edb commit 3fa917c

28 files changed

+78
-94
lines changed

‎scripts/Build.ps1

+4-2
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ function Invoke-MSBuild([string]$solution, $buildTarget = $Target, $hasVsixExten
234234
"-p:IsLocalizedBuild=$TFB_IsLocalizedBuild",
235235
"-p:UpdateXlf=$TFB_UpdateXlf",
236236
"-p:BuildVersion=$TFB_BuildVersion",
237+
"-p:BranchName=`"$TPB_BRANCH`"",
238+
"-p:CommitHash=$TPB_COMMIT",
237239
"-restore:$restore",
238240
"`"$solutionPath`"",
239241
"-bl:`"$binLog`"",
@@ -304,8 +306,8 @@ function Create-NugetPackages {
304306
$SystemPrivateUriVersion = Get-PackageVersion -PackageName "SystemPrivateUriVersion"
305307
$SystemXmlReaderWriterVersion = Get-PackageVersion -PackageName "SystemXmlReaderWriterVersion"
306308

307-
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"
308-
& $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
309+
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"
310+
& $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
309311
if ($lastExitCode -ne 0) {
310312
throw "Nuget pack failed with an exit code of '$lastExitCode'."
311313
}

‎scripts/build/TestFx.props

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
<IsTest Condition=" '$(IsTest)' == '' ">false</IsTest>
99
</PropertyGroup>
1010

11+
<PropertyGroup>
12+
<BranchName Condition=" '$(BranchName)' == '' ">BRANCHNAME</BranchName>
13+
<CommitHash Condition=" '$(CommitHash)' == '' ">COMMITHASH</CommitHash>
14+
<CommitId>$(CommitHash.SubString(0, 8))</CommitId>
15+
</PropertyGroup>
16+
1117
<Import Project="$(RepoRoot)eng\Versions.props" />
1218
<Import Project="$(RepoRoot)scripts\build\TestFx.Sign.props" Condition=" '$(TestFxSigningPropsImported)' != 'true' " />
1319

‎scripts/build/TestFx.targets

+36-15
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Analyzer Include="$(NuGetPackageRoot)\StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
1515
<Analyzer Include="$(NuGetPackageRoot)\StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
1616
</ItemGroup>
17-
1817

1918
<!-- WARNING remove this when SDK-style project conversion is being done. -->
2019
<!--
@@ -36,33 +35,55 @@
3635
<PropertyGroup>
3736
<TFBuildNumber Condition=" '$(TFBuildNumber)' == '' ">0.1</TFBuildNumber>
3837
<MajorVersion>14.0</MajorVersion>
38+
<GeneratedAssemblyInfoFile Condition="'$(GeneratedAssemblyInfoFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo.cs</GeneratedAssemblyInfoFile>
39+
<Company>Microsoft Corporation</Company>
40+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
3941
<AssemblyVersion>$(MajorVersion).0.0</AssemblyVersion>
4042
<BuildVersion Condition=" '$(BuildVersion)' == '' ">$(MajorVersion).$(TFBuildNumber)</BuildVersion>
41-
</PropertyGroup>
42-
43-
<PropertyGroup>
44-
<GeneratedAssemblyInfoFile Condition="'$(GeneratedAssemblyInfoFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo.cs</GeneratedAssemblyInfoFile>
43+
<FileVersion Condition=" '$(FileVersion)' == '' ">$(BuildVersion)</FileVersion>
44+
<InformationalVersion>$(BuildVersion)+$(CommitId)</InformationalVersion>
4545
</PropertyGroup>
4646

4747
<ItemGroup>
48-
<AssemblyVersionAttribute Include="System.Reflection.AssemblyVersionAttribute">
48+
<!-- Not including branch name assemblies for now. -->
49+
<!-- <AssemblyMetadata Include="Branch" Value="$(BranchName)" /> -->
50+
<AssemblyMetadata Include="Commit" Value="$(CommitHash)" />
51+
</ItemGroup>
52+
53+
<ItemGroup Condition=" '$(GenerateAssemblyInfo)' == 'false' ">
54+
<AssemblyAttribute Include="System.Reflection.AssemblyCompanyAttribute" Condition="'$(Company)' != '' and '$(GenerateAssemblyCompanyAttribute)' == 'true'">
55+
<_Parameter1>$(Company)</_Parameter1>
56+
</AssemblyAttribute>
57+
<AssemblyAttribute Include="System.Reflection.AssemblyCopyrightAttribute" Condition="'$(Copyright)' != '' and '$(GenerateAssemblyCopyrightAttribute)' == 'true'">
58+
<_Parameter1>$(Copyright)</_Parameter1>
59+
</AssemblyAttribute>
60+
<AssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute" Condition="'$(AssemblyVersion)' != ''">
4961
<_Parameter1>$(AssemblyVersion)</_Parameter1>
50-
</AssemblyVersionAttribute>
51-
<AssemblyVersionAttribute Include="System.Reflection.AssemblyFileVersionAttribute">
52-
<_Parameter1>$(BuildVersion)</_Parameter1>
53-
</AssemblyVersionAttribute>
54-
<AssemblyVersionAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute">
55-
<_Parameter1>$(BuildVersion)</_Parameter1>
56-
</AssemblyVersionAttribute>
62+
</AssemblyAttribute>
63+
<AssemblyAttribute Include="System.Reflection.AssemblyFileVersionAttribute" Condition="'$(FileVersion)' != ''">
64+
<_Parameter1>$(FileVersion)</_Parameter1>
65+
</AssemblyAttribute>
66+
<AssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute" Condition="'$(InformationalVersion)' != ''">
67+
<_Parameter1>$(InformationalVersion)</_Parameter1>
68+
</AssemblyAttribute>
69+
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(GenerateRepositoryUrlAttribute)' != 'true'" >
70+
<_Parameter1>RepositoryUrl</_Parameter1>
71+
<_Parameter2 Condition="'$(RepositoryUrl)' != ''">$(RepositoryUrl)</_Parameter2>
72+
<_Parameter2 Condition="'$(RepositoryUrl)' == ''">$(PrivateRepositoryUrl)</_Parameter2>
73+
</AssemblyAttribute>
74+
<AssemblyAttribute Include="System.Reflection.AssemblyMetadata" Condition="'$(GenerateAssemblyMetadataAttributes)' != 'true'">
75+
<_Parameter1>%(AssemblyMetadata.Identity)</_Parameter1>
76+
<_Parameter2>%(AssemblyMetadata.Value)</_Parameter2>
77+
</AssemblyAttribute>
5778
</ItemGroup>
5879

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

65-
<WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)" Language="C#" OutputFile="$(GeneratedAssemblyInfoFile)" Condition=" '$(SkipAppendingVersion)' != 'true' ">
86+
<WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)" Language="C#" OutputFile="$(GeneratedAssemblyInfoFile)">
6687
<Output TaskParameter="OutputFile" ItemName="Compile" />
6788
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
6889
</WriteCodeFragment>

‎src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumerator.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ private IEnumerable<UnitTestElement> DiscoverTestsInType(string assemblyFileName
211211
try
212212
{
213213
typeFullName = type.FullName;
214-
var unitTestCases = this.GetTypeEnumerator(type, assemblyFileName, discoverInternals).Enumerate(out var warningsFromTypeEnumerator);
214+
var testTypeEnumerator = this.GetTypeEnumerator(type, assemblyFileName, discoverInternals);
215+
var unitTestCases = testTypeEnumerator.Enumerate(out var warningsFromTypeEnumerator);
215216
var typeIgnored = ReflectHelper.IsAttributeDefined(type, typeof(UTF.IgnoreAttribute), false);
216217

217218
if (warningsFromTypeEnumerator != null)

‎src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎src/Adapter/MSTest.CoreAdapter/ObjectModel/TestMethod.cs

+4
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ public TestMethod(string name, string fullClassName, string assemblyName, bool i
4747
this.IsAsync = isAsync;
4848

4949
var hierarchy = new string[HierarchyConstants.Levels.TotalLevelCount];
50+
hierarchy[HierarchyConstants.Levels.ContainerIndex] = null;
5051
hierarchy[HierarchyConstants.Levels.NamespaceIndex] = fullClassName;
5152
hierarchy[HierarchyConstants.Levels.ClassIndex] = name;
53+
hierarchy[HierarchyConstants.Levels.TestGroupIndex] = name;
5254

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

6466
ManagedNameHelper.GetManagedName(method, out var managedType, out var managedMethod, out var hierarchyValues);
67+
hierarchyValues[HierarchyConstants.Levels.ContainerIndex] = null; // This one will be set by test windows to current test project name.
68+
6569
this.ManagedTypeName = managedType;
6670
this.ManagedMethodName = managedMethod;
6771
this.hierarchy = new ReadOnlyCollection<string>(hierarchyValues);

‎src/Adapter/MSTest.CoreAdapter/ObjectModel/UnitTestElement.cs

+20-19
Original file line numberDiff line numberDiff line change
@@ -229,25 +229,26 @@ internal TestCase ToTestCase()
229229
{
230230
}
231231

232-
var idProvider = new TestIdProvider();
233-
idProvider.AppendString(testCase.ExecutorUri?.ToString());
234-
idProvider.AppendString(fileName);
235-
if (this.TestMethod.HasManagedMethodAndTypeProperties)
236-
{
237-
idProvider.AppendString(this.TestMethod.ManagedTypeName);
238-
idProvider.AppendString(this.TestMethod.ManagedMethodName);
239-
}
240-
else
241-
{
242-
idProvider.AppendString(testCase.FullyQualifiedName);
243-
}
244-
245-
if (this.TestMethod.DataType != DynamicDataType.None)
246-
{
247-
idProvider.AppendString(testCase.DisplayName);
248-
}
249-
250-
testCase.Id = idProvider.GetId();
232+
// This code is disabled for compatibility.
233+
// var idProvider = new TestIdProvider();
234+
// idProvider.AppendString(testCase.ExecutorUri?.ToString());
235+
// idProvider.AppendString(fileName);
236+
// if (this.TestMethod.HasManagedMethodAndTypeProperties)
237+
// {
238+
// idProvider.AppendString(this.TestMethod.ManagedTypeName);
239+
// idProvider.AppendString(this.TestMethod.ManagedMethodName);
240+
// }
241+
// else
242+
// {
243+
// idProvider.AppendString(testCase.FullyQualifiedName);
244+
// }
245+
//
246+
// if (this.TestMethod.DataType != DynamicDataType.None)
247+
// {
248+
// idProvider.AppendString(testCase.DisplayName);
249+
// }
250+
//
251+
// testCase.Id = idProvider.GetId();
251252

252253
return testCase;
253254
}

‎src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎src/Adapter/PlatformServices.Desktop/Properties/AssemblyInfo.cs

-32
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,7 @@
66
using System.Runtime.CompilerServices;
77
using System.Runtime.InteropServices;
88

9-
// General Information about an assembly is controlled through the following
10-
// set of attributes. Change these attribute values to modify the information
11-
// associated with an assembly.
12-
[assembly: AssemblyTitle("PlatformServices.Desktop")]
13-
[assembly: AssemblyDescription("")]
14-
[assembly: AssemblyConfiguration("")]
15-
[assembly: AssemblyCompany("Microsoft Corporation")]
16-
[assembly: AssemblyProduct("PlatformServices.Desktop")]
17-
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
18-
[assembly: AssemblyTrademark("")]
19-
[assembly: AssemblyCulture("")]
20-
21-
// Setting ComVisible to false makes the types in this assembly not visible
22-
// to COM components. If you need to access a type in this assembly from
23-
// COM, set the ComVisible attribute to true on that type.
249
[assembly: ComVisible(false)]
25-
26-
// The following GUID is for the ID of the typelib if this project is exposed to COM
2710
[assembly: Guid("b0fce474-14bc-449a-91ea-a433342c0d63")]
28-
29-
// Version information for an assembly consists of the following four values:
30-
//
31-
// Major Version
32-
// Minor Version
33-
// Build Number
34-
// Revision
35-
//
36-
// You can specify all the values or you can default the Build and Revision Numbers
37-
// by using the '*' as shown below:
38-
// [assembly: AssemblyVersion("1.0.*")]
39-
40-
// This is set by GlobalAssemblyInfo which is auto-generated due to import of TestPlatform.NonRazzle.targets
41-
// [assembly: AssemblyVersion("1.0.0.0")]
42-
// [assembly: AssemblyFileVersion("1.0.0.0")]
4311
[assembly: TypeForwardedTo(typeof(SerializableAttribute))]
4412
[assembly: TypeForwardedTo(typeof(MarshalByRefObject))]

‎src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<!-- Remove after ARCADE transition -->
1010
<PropertyGroup>
11-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1211
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
1312

1413
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>

‎src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
<!-- Remove after ARCADE transition -->
3232
<PropertyGroup>
33-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
3433
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
3534
</PropertyGroup>
3635
<!-- / Remove after ARCADE transition -->

‎src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
<!-- Remove after ARCADE transition -->
1515
<PropertyGroup>
16-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1716
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
1817

1918
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>

‎src/Adapter/PlatformServices.WinUI/Properties/AssemblyInfo.cs

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
using System.Runtime.InteropServices;
88
using System.Runtime.Versioning;
99

10-
[assembly: AssemblyDescription("")]
11-
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
12-
[assembly: AssemblyTrademark("")]
13-
[assembly: AssemblyCulture("")]
14-
1510
[assembly: ComVisible(false)]
1611

1712
[assembly: TypeForwardedTo(typeof(SerializableAttribute))]

‎src/Package/MSTest.Internal.TestFx.Documentation.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<repository type="git"
2020
url="https://github.com/microsoft/testfx"
2121
branch="$BranchName$"
22-
commit="$CommitId$" />
22+
commit="$CommitHash$" />
2323
</metadata>
2424
<files>
2525
<!--DotNet-->

‎src/Package/MSTest.TestAdapter.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<repository type="git"
2828
url="https://github.com/microsoft/testfx"
2929
branch="$BranchName$"
30-
commit="$CommitId$" />
30+
commit="$CommitHash$" />
3131

3232
<dependencies>
3333
<group targetFramework="netcoreapp1.0">

‎src/Package/MSTest.TestAdapter.symbols.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<repository type="git"
2828
url="https://github.com/microsoft/testfx"
2929
branch="$BranchName$"
30-
commit="$CommitId$" />
30+
commit="$CommitHash$" />
3131

3232
<dependencies>
3333
<group targetFramework="netcoreapp1.0">

‎src/Package/MSTest.TestFramework.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<repository type="git"
3131
url="https://github.com/microsoft/testfx"
3232
branch="$BranchName$"
33-
commit="$CommitId$" />
33+
commit="$CommitHash$" />
3434

3535
<dependencies>
3636
<group targetFramework="netstandard1.4">

‎src/Package/MSTest.TestFramework.symbols.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<repository type="git"
3030
url="https://github.com/microsoft/testfx"
3131
branch="$BranchName$"
32-
commit="$CommitId$" />
32+
commit="$CommitHash$" />
3333

3434
<dependencies>
3535
<group targetFramework="netstandard1.4">

‎src/Package/MSTest.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<repository type="git"
2828
url="https://github.com/microsoft/testfx"
2929
branch="$BranchName$"
30-
commit="$CommitId$" />
30+
commit="$CommitHash$" />
3131

3232
<dependencies>
3333
<group targetFramework="netcoreapp1.0">

‎src/TestFramework/Extension.Core/Extension.Core.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎src/TestFramework/Extension.Desktop/Extension.Desktop.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎src/TestFramework/Extension.UWP/Extension.UWP.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
<!-- Remove after ARCADE transition -->
3232
<PropertyGroup>
33-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
3433
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
3534
</PropertyGroup>
3635
<!-- / Remove after ARCADE transition -->

‎src/TestFramework/Extension.WinUI/Extension.WinUI.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<Product>Extension.WinUI</Product>
77
<AssemblyTitle>Extension.WinUI</AssemblyTitle>
88
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
9-
<SkipAppendingVersion>true</SkipAppendingVersion> <!-- TODO: remove after full arcade transition -->
109

1110
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
1211
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>

‎src/TestFramework/MSTest.Core/MSTest.Core.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<!-- Remove after ARCADE transition -->
2020
<PropertyGroup>
21-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2221
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
2322
</PropertyGroup>
2423
<!-- / Remove after ARCADE transition -->

‎test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
<IsPackable>false</IsPackable>
77
<NoWarn>1685</NoWarn>
8-
<SkipAppendingVersion>true</SkipAppendingVersion>
98
<ShouldEnableStyleCop>false</ShouldEnableStyleCop>
109
</PropertyGroup>
1110

0 commit comments

Comments
 (0)