Skip to content

Commit

Permalink
Fixed CI (#82)
Browse files Browse the repository at this point in the history
* Removed Microsoft.Windows.SDK.BuildTools from wapproj so it pass MS Store certification.

* fixed CI
  • Loading branch information
veler authored Nov 28, 2021
1 parent 8207ae6 commit 347ee0c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 4 additions & 1 deletion ci/azure-pipelines-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ pool:
variables:
group: BuildPipelineVariables
uwpProject: '**/*.wapproj'
buildPlatform: 'x86|x64|arm64'
buildConfiguration: 'Release'
appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'
buildFolder: '$(Build.SourcesDirectory)\bin\'
Expand All @@ -23,6 +22,8 @@ jobs:
- job: SideloadRelease
displayName: 'Sideload Release Build'
timeoutInMinutes: 120
variables:
buildPlatform: 'x86|x64|arm64'
steps:

- task: PowerShell@2
Expand Down Expand Up @@ -103,6 +104,8 @@ jobs:
- job: StoreRelease
displayName: 'Store Release Build'
timeoutInMinutes: 120
variables:
buildPlatform: 'x86|x64'
steps:

- task: PowerShell@2
Expand Down
1 change: 0 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<Nuget_MicrosoftTypeScriptMSBuild>4.4.2</Nuget_MicrosoftTypeScriptMSBuild>
<NuGet_MicrosoftUIXaml>2.6.2</NuGet_MicrosoftUIXaml>
<NuGet_MicrosoftWindowsCsWinRT>1.3.5</NuGet_MicrosoftWindowsCsWinRT>
<NuGet_MicrosoftWindowsSDKBuildTools>10.0.20348.19</NuGet_MicrosoftWindowsSDKBuildTools>
<NuGet_MSTestTestAdapter>2.1.1</NuGet_MSTestTestAdapter>
<NuGet_MSTestTestFramework>2.1.1</NuGet_MSTestTestFramework>
<NuGet_NewtonsoftJson>12.0.3</NuGet_NewtonsoftJson>
Expand Down
3 changes: 0 additions & 3 deletions src/dev/DevToys.Startup/DevToys.Startup.wapproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@
<Content Include="Assets\Logo-Prev\Wide310x150Logo.scale-400.png" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(NuGet_MicrosoftWindowsSDKBuildTools)" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
Expand Down

0 comments on commit 347ee0c

Please sign in to comment.