Fix: Fixed an issue where the credential file copying wasn't overriden

0x5bfa · Aug 17, 2023 · 4ce16cb · 4ce16cb
1 parent d9e9a5e
commit 4ce16cb
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 28 deletions.
diff --git a/builds/ci-pr.yml b/builds/ci-pr.yml
@@ -68,6 +68,7 @@ jobs:
     displayName: 'Download CA certificate'
     inputs:
       secureFile: '$(signingCert.secureFilePath)'
+      overWrite: true
 
   - task: UseDotNet@2
     inputs:

diff --git a/builds/ci.yml b/builds/ci.yml
@@ -63,6 +63,7 @@ jobs:
       SourceFolder: '$(Agent.TempDirectory)'
       Contents: '$(CredentialSecureFile.secureFilePath)'
       TargetFolder: '$(Build.SourcesDirectory)\src\FluentHub.App'
+      overWrite: true
 
   - task: DownloadSecureFile@1
     name: caCertificate

diff --git a/src/FluentHub.App/FluentHub.App.csproj b/src/FluentHub.App/FluentHub.App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
+        <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
         <OutputType>WinExe</OutputType>
         <AssemblyName>FluentHub</AssemblyName>
         <DefaultLanguage>en-US</DefaultLanguage>

diff --git a/src/FluentHub.Package/FluentHub.Package.wapproj b/src/FluentHub.Package/FluentHub.Package.wapproj
@@ -1,8 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
     <VisualStudioVersion>17.0</VisualStudioVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
+    <AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
+    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
+    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <DisableXbfLineInfo>False</DisableXbfLineInfo>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
+    <AppxDefaultResourceQualifiers>Language=en-US;ja-JP</AppxDefaultResourceQualifiers>
+    <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <EntryPointProjectUniqueName>..\FluentHub.App\FluentHub.App.csproj</EntryPointProjectUniqueName>
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x86">
       <Configuration>Debug</Configuration>
@@ -41,51 +65,34 @@
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
     <PathToXAMLWinRTImplementations>FluentHub.App\</PathToXAMLWinRTImplementations>
   </PropertyGroup>
+
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
-    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
-    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
-    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
-    <DisableXbfLineInfo>False</DisableXbfLineInfo>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
-    <AppxDefaultResourceQualifiers>Language=en-US;ja-JP</AppxDefaultResourceQualifiers>
-    <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <EntryPointProjectUniqueName>..\FluentHub.App\FluentHub.App.csproj</EntryPointProjectUniqueName>
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
+
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Assets\AppTiles\**" />
-    <Content Include="Package.appinstaller" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\FluentHub.App\FluentHub.App.csproj">
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
       <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
       <TrustLevel>Partial</TrustLevel>
     </ProjectReference>
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" IncludeAssets="build" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" IncludeAssets="build" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" IncludeAssets="build" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" IncludeAssets="build" />
   </ItemGroup>
+
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-</Project>
+
+</Project>