Merge remote-tracking branch 'origin/master' into user/dmachaj/no-loadlibrary

Author: dmachaj

.pipelines/OneBranch.Official.yml

@@ -130,12 +130,6 @@ extends:
                 artifactName: 'drop_build_x64'
                 targetPath: '$(Build.SourcesDirectory)/x64'
 
-            - task: DownloadPipelineArtifact@2
-              displayName: 'Download arm artifacts'
-              inputs:
-                artifactName: 'drop_build_arm'
-                targetPath: '$(Build.SourcesDirectory)/arm'
-
             - task: DownloadPipelineArtifact@2
               displayName: 'Download arm64 artifacts'
               inputs:
@@ -159,7 +153,6 @@ extends:
                   echo d | xcopy $(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib build\native\lib\Win32
                   echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib  build\native\lib\amd64
                   echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib  build\native\lib\x64
-                  echo d | xcopy $(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib  build\native\lib\arm
                   echo d | xcopy $(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib  build\native\lib\arm64
 
     - stage: NuGet

.pipelines/build.yml

@@ -31,8 +31,6 @@ jobs:
         buildPlatform: 'x86'
       x64:
         buildPlatform: 'x64'
-      arm:
-        buildPlatform: 'arm'
       arm64:
         buildPlatform: 'arm64'
 
@@ -169,12 +167,6 @@ jobs:
       artifactName: $(BuildConfiguration)_x64
       downloadPath: $(Build.SourcesDirectory)\x64
 
-  - task: DownloadPipelineArtifact@1
-    displayName: Download arm Artifacts
-    inputs:
-      artifactName: $(BuildConfiguration)_arm
-      downloadPath: $(Build.SourcesDirectory)\arm
-
   - task: DownloadPipelineArtifact@1
     displayName: Download arm64 Artifacts
     inputs:
@@ -262,7 +254,7 @@ jobs:
   - task: CmdLine@2
     displayName: Stage MSBuild vpack
     inputs:
-      script: "set TargetDir=$(Build.SourcesDirectory)\\msbuild\nrd /s /q %TargetDir% >nul 2>&1\nmd %TargetDir%\ncd %TargetDir%\n\ncopy $(Build.SourcesDirectory)\\vsix\\Microsoft.Cpp.CppWinRT.props\ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.props Microsoft.Cpp.CppWinRTEnabled.props \ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.targets Microsoft.Cpp.CppWinRTEnabled.targets\ncopy $(Build.SourcesDirectory)\\nuget\\CppWinrtRules.Project.xml CppWinrtRules.Project.xml\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\i386\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\Win32\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\amd64\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\x64\necho d | xcopy $(Build.SourcesDirectory)\\arm\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm\necho d | xcopy $(Build.SourcesDirectory)\\arm64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm64\n"
+      script: "set TargetDir=$(Build.SourcesDirectory)\\msbuild\nrd /s /q %TargetDir% >nul 2>&1\nmd %TargetDir%\ncd %TargetDir%\n\ncopy $(Build.SourcesDirectory)\\vsix\\Microsoft.Cpp.CppWinRT.props\ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.props Microsoft.Cpp.CppWinRTEnabled.props \ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.targets Microsoft.Cpp.CppWinRTEnabled.targets\ncopy $(Build.SourcesDirectory)\\nuget\\CppWinrtRules.Project.xml CppWinrtRules.Project.xml\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\i386\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\Win32\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\amd64\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\x64\necho d | xcopy $(Build.SourcesDirectory)\\arm64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm64\n"
       failOnStderr: true
 
   - task: PkgESVPack@12
@@ -343,12 +335,6 @@ jobs:
       artifactName: $(BuildConfiguration)_x64
       downloadPath: $(Build.SourcesDirectory)\x64
 
-  - task: DownloadPipelineArtifact@1
-    displayName: Download arm Artifacts
-    inputs:
-      artifactName: $(BuildConfiguration)_arm
-      downloadPath: $(Build.SourcesDirectory)\arm
-
   - task: DownloadPipelineArtifact@1
     displayName: Download arm64 Artifacts
     inputs:
@@ -430,7 +416,7 @@ jobs:
       command: pack
       searchPatternPack: nuget/Microsoft.Windows.CppWinRT.nuspec
       versioningScheme: byBuildNumber
-      buildProperties: 'target_version=$(Build.BuildNumber);cppwinrt_exe=$(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=$(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib '
+      buildProperties: 'target_version=$(Build.BuildNumber);cppwinrt_exe=$(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib '
 
   - task: ComponentGovernanceComponentDetection@0
     displayName: Component Detection

.pipelines/jobs/OneBranchBuild.yml

@@ -20,8 +20,6 @@ jobs:
         BuildPlatform: 'x86'
       x64:
         BuildPlatform: 'x64'
-      arm:
-        BuildPlatform: 'arm'
       arm64:
         BuildPlatform: 'arm64'
 

.pipelines/jobs/OneBranchNuGet.yml

@@ -43,12 +43,6 @@ jobs:
           artifactName: 'drop_build_x64'
           targetPath: '$(Build.SourcesDirectory)/x64'
 
-      - task: DownloadPipelineArtifact@1
-        displayName: 'Download arm artifacts'
-        inputs:
-          artifactName: 'drop_build_arm'
-          targetPath: '$(Build.SourcesDirectory)/arm'
-
       - task: DownloadPipelineArtifact@1
         displayName: 'Download arm64 artifacts'
         inputs:
@@ -59,7 +53,7 @@ jobs:
         displayName: 'Build NuGet package'
         inputs:
           command: 'custom'
-          arguments: 'pack nuget/Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory $(ob_outputDirectory)\packages -Properties Configuration=release;cppwinrt_exe=$(Build.SourcesDirectory)\x86\cppwinrt\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=$(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib;target_version=$(PackageVersion) -Version $(PackageVersion) -Verbosity Detailed'
+          arguments: 'pack nuget/Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory $(ob_outputDirectory)\packages -Properties Configuration=release;cppwinrt_exe=$(Build.SourcesDirectory)\x86\cppwinrt\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib;target_version=$(PackageVersion) -Version $(PackageVersion) -Verbosity Detailed'
 
       - task: onebranch.pipeline.signing@1
         displayName: '🔒 Onebranch Signing for NuGet package'

.pipelines/jobs/OneBranchVsix.yml

@@ -71,12 +71,6 @@ jobs:
         artifactName: 'drop_build_x64'
         targetPath: '$(Build.SourcesDirectory)\x64'
 
-    - task: DownloadPipelineArtifact@2
-      displayName: 'Download arm binaries'
-      inputs:
-        artifactName: 'drop_build_arm'
-        targetPath: '$(Build.SourcesDirectory)\arm'
-
     - task: DownloadPipelineArtifact@2
       displayName: 'Download arm64 binaries'
       inputs:

Directory.Build.Props

@@ -42,7 +42,7 @@
     <CppWinRTPlatform Condition="'$(Platform)'=='Win32'">x86</CppWinRTPlatform>
     <OutDir>$(SolutionDir)_build\$(CppWinRTPlatform)\$(Configuration)\</OutDir>
     <CppWinRTDir>$(OutDir)</CppWinRTDir>
-    <CppWinRTDir Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">$(SolutionDir)_build\x86\$(Configuration)\</CppWinRTDir>
+    <CppWinRTDir Condition="'$(Platform)'=='ARM64'">$(SolutionDir)_build\x86\$(Configuration)\</CppWinRTDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

README.md

@@ -19,7 +19,7 @@ If you really want to build it yourself, the simplest way to do so is to run the
 * Open the `cppwinrt.sln` solution.
 * Choose a configuration (x64, x86, Release, Debug) and build projects as needed.
 
-If you are working on an ARM64 or ARM specific issue from an x64 or x86 host, you will need to instead:
+If you are working on an ARM64 specific issue from an x64 or x86 host, you will need to instead:
 
 * Open the `cppwinrt.sln` solution
 * Build the x86 version of the "cppwinrt" project first

build_nuget.cmd

@@ -5,9 +5,8 @@ if "%target_version%"=="" set target_version=3.0.0.0
 
 call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
 call msbuild /m /p:Configuration=Release,Platform=x64,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
-call msbuild /m /p:Configuration=Release,Platform=arm,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
 call msbuild /m /p:Configuration=Release,Platform=arm64,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
 
 call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
 
-nuget pack nuget\Microsoft.Windows.CppWinRT.nuspec -Properties target_version=%target_version%;cppwinrt_exe=%cd%\_build\x86\Release\cppwinrt.exe;cppwinrt_fast_fwd_x86=%cd%\_build\x86\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%cd%\_build\x64\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%cd%\_build\arm\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%cd%\_build\arm64\Release\cppwinrt_fast_forwarder.lib 
+nuget pack nuget\Microsoft.Windows.CppWinRT.nuspec -Properties target_version=%target_version%;cppwinrt_exe=%cd%\_build\x86\Release\cppwinrt.exe;cppwinrt_fast_fwd_x86=%cd%\_build\x86\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%cd%\_build\x64\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%cd%\_build\arm64\Release\cppwinrt_fast_forwarder.lib 

build_prior_projection.cmd

@@ -12,7 +12,6 @@ if /I "%target_platform%" equ "all" (
   )
   call %0 x86 !target_configuration!
   call %0 x64 !target_configuration!
-  call %0 arm !target_configuration!
   call %0 arm64 !target_configuration!
   goto :eof
 )

build_projection.cmd

@@ -12,7 +12,6 @@ if /I "%target_platform%" equ "all" (
   )
   call %0 x86 !target_configuration!
   call %0 x64 !target_configuration!
-  call %0 arm !target_configuration!
   call %0 arm64 !target_configuration!
   goto :eof
 )