From 6f4b23dd1057ee2d0c2c0684aedcd3797adfbaa3 Mon Sep 17 00:00:00 2001 From: Howard Kapustein Date: Fri, 13 Aug 2021 19:20:45 -0700 Subject: [PATCH] Removed MrtCoreManagedTest from the build due to a fundamental incompatibility (ut's a Universal Windows project referencing Microsoft.ApplicationModel.Resources (the WinRT dll) which isn't, and VS doesn't like crossing streams. Even worse, VS and msbuild produce different results!). --- build/build-mrt.yml | 16 ++-------------- dev/MRTCore/mrt/MrtCore.sln | 26 ++------------------------ 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/build/build-mrt.yml b/build/build-mrt.yml index bcf489b4b..ec79d9802 100644 --- a/build/build-mrt.yml +++ b/build/build-mrt.yml @@ -61,7 +61,7 @@ steps: # targetType: filePath # filePath: ${{ parameters.MRTSourcesDirectory }}\build\Initialize-InstallMSBuild.ps1 # arguments: '-installDir ${{ parameters.MRTSourcesDirectory }}\.buildtools -logsDir ${{ parameters.MRTSourcesDirectory }}\msbuild-install-logs' - + # - task: BatchScript@1 # displayName: Add the VS build tools to the path # inputs: @@ -81,7 +81,7 @@ steps: inputs: targetType: filePath workingDirectory: ${{ parameters.MRTSourcesDirectory }}\build - filePath: ${{ parameters.MRTSourcesDirectory }}\build\DownloadDotNetCoreSdk.ps1 + filePath: ${{ parameters.MRTSourcesDirectory }}\build\DownloadDotNetCoreSdk.ps1 - task: BatchScript@1 displayName: 'Use .NET SDK' @@ -126,17 +126,6 @@ steps: artifactName: binlogs # Run the test locally on the Azure VM. -- task: VSTest@2 - displayName: 'test MRT: ManagedTests' - condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64'))) - inputs: - testSelector: 'testAssemblies' - testAssemblyVer2: '**\MrtCoreManagedTest.build.appxrecipe' - searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\MrtCoreManagedTest' - testRunTitle: 'test MRT: ManagedTests - $(buildPlatform)' - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' - - task: VSTest@2 displayName: 'test MRT: UnitTests' condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64'))) @@ -179,7 +168,6 @@ steps: Contents: | MrmBaseUnitTests\** MrmUnitTest\** - MrtCoreManagedTest\** MrtCoreUnpackagedTests\** TargetFolder: '$(Agent.TempDirectory)\mrt_testbin\$(buildPlatform)' diff --git a/dev/MRTCore/mrt/MrtCore.sln b/dev/MRTCore/mrt/MrtCore.sln index 82ca0d2e0..d083af052 100644 --- a/dev/MRTCore/mrt/MrtCore.sln +++ b/dev/MRTCore/mrt/MrtCore.sln @@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRM", "Core\src\MRM.vcxproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MrmUnitTest", "Core\UnitTests\MrmUnitTest.vcxproj", "{8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrtCoreManagedTest", "Microsoft.ApplicationModel.Resources\unittests\MrtCoreManagedTest.csproj", "{ED418091-1095-4873-80E5-2F36C9E763DC}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ApplicationModel.Resources", "Microsoft.ApplicationModel.Resources\src\Microsoft.ApplicationModel.Resources.vcxproj", "{9B3B03BC-1BC0-43EA-B3FF-D5214F3CF5CF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrmmin", "mrm\mrmmin\mrmmin.vcxproj", "{AB199369-87E7-44B4-AE83-7CF5C068EFEB}" @@ -63,26 +61,6 @@ Global {8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}.Release|x64.Build.0 = Release|x64 {8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}.Release|x86.ActiveCfg = Release|Win32 {8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}.Release|x86.Build.0 = Release|Win32 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|ARM.ActiveCfg = Debug|ARM - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|ARM.Build.0 = Debug|ARM - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|ARM.Deploy.0 = Debug|ARM - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|x64.ActiveCfg = Debug|x64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|x64.Build.0 = Debug|x64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|x64.Deploy.0 = Debug|x64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|x86.ActiveCfg = Debug|x86 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|x86.Build.0 = Debug|x86 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Debug|x86.Deploy.0 = Debug|x86 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|ARM.ActiveCfg = Release|ARM - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|ARM.Build.0 = Release|ARM - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|ARM.Deploy.0 = Release|ARM - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|ARM64.ActiveCfg = Release|ARM64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|x64.ActiveCfg = Release|x64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|x64.Build.0 = Release|x64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|x64.Deploy.0 = Release|x64 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|x86.ActiveCfg = Release|x86 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|x86.Build.0 = Release|x86 - {ED418091-1095-4873-80E5-2F36C9E763DC}.Release|x86.Deploy.0 = Release|x86 {9B3B03BC-1BC0-43EA-B3FF-D5214F3CF5CF}.Debug|ARM.ActiveCfg = Debug|ARM64 {9B3B03BC-1BC0-43EA-B3FF-D5214F3CF5CF}.Debug|ARM64.ActiveCfg = Debug|ARM64 {9B3B03BC-1BC0-43EA-B3FF-D5214F3CF5CF}.Debug|ARM64.Build.0 = Debug|ARM64 @@ -157,13 +135,13 @@ Global {42876BA9-25BB-46E7-9EE1-CA5FDF703C72}.Release|x86.ActiveCfg = Release|x86 {42876BA9-25BB-46E7-9EE1-CA5FDF703C72}.Release|x86.Build.0 = Release|x86 {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|ARM.ActiveCfg = Debug|ARM - {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|ARM64.ActiveCfg = Debug|Win32 {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|x64.ActiveCfg = Debug|x64 {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|x64.Build.0 = Debug|x64 {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|x86.ActiveCfg = Debug|Win32 {3C618444-4B80-492E-8972-BFAEF8700A52}.Debug|x86.Build.0 = Debug|Win32 {3C618444-4B80-492E-8972-BFAEF8700A52}.Release|ARM.ActiveCfg = Release|ARM - {3C618444-4B80-492E-8972-BFAEF8700A52}.Release|ARM64.ActiveCfg = Release|ARM64 + {3C618444-4B80-492E-8972-BFAEF8700A52}.Release|ARM64.ActiveCfg = Release|Win32 {3C618444-4B80-492E-8972-BFAEF8700A52}.Release|x64.ActiveCfg = Release|x64 {3C618444-4B80-492E-8972-BFAEF8700A52}.Release|x64.Build.0 = Release|x64 {3C618444-4B80-492E-8972-BFAEF8700A52}.Release|x86.ActiveCfg = Release|Win32