A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed Ci and build
Etienne Baudouxb95602767e06
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.ymlindex 816a40679..4dd0af3a6 100644--- a/ci/azure-pipelines.yml+++ b/ci/azure-pipelines.yml@@ -12,6 +12,7 @@ pool:variables:group: BuildPipelineVariablessolution: '**/*.sln'+ uwpProject: '**/*.wapproj'buildPlatform: 'x86|x64|ARM|ARM64'buildConfiguration: 'Release'appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'@@ -57,23 +58,24 @@ jobs:msbuildArguments: '/t:restore'- task: MSBuild@1- displayName: 'Build solution'+ displayName: 'Build UWP AppxBundle'inputs:- solution: '$(solution)'+ solution: '$(uwpProject)'configuration: '$(buildConfiguration)'- msbuildArguments: '/t:build;_GenerateAppxPackage /p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxPackageSigningEnabled=false /p:AppxBundle=Always'+ msbuildArguments: '/t:build /p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxPackageSigningEnabled=false /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload'maximumCpuCount: true- # Older version used in this test build https://etienne-baudoux.visualstudio.com/Side%20projects/_build/results?buildId=245- # - task: MSBuild@1- # displayName: 'Build solution'- # inputs:- # solution: '**/*.sln'- # configuration: '$(buildConfiguration)'- # msbuildArguments: '/p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageSigningEnabled=false /p:AppxBundle=Always'+ - task: MSBuild@1+ displayName: 'Build Tests'+ inputs:+ solution: '$(solution)'+ configuration: '$(buildConfiguration)'+ platform: 'x64'+ msbuildArguments: '/t:build'+ maximumCpuCount: true- task: VSTest@2- displayName: 'Tests'+ displayName: 'Run Tests'inputs:testSelector: 'testAssemblies'testAssemblyVer2: |diff --git a/src/Directory.Build.props b/src/Directory.Build.propsindex 9d5e701aa..ec2cd1079 100644--- a/src/Directory.Build.props+++ b/src/Directory.Build.props@@ -8,9 +8,11 @@<!-- Defines the bin and obj folder paths --><RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))\</RepoRoot>- <BaseOutputPath>$(RepoRoot)bin\</BaseOutputPath>- <BaseIntermediateOutputPath>$(RepoRoot)obj\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>- <OutputPath>$(BaseOutputPath)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath>+ <BaseOutputPath>$(RepoRoot)bin\$(Configuration)\$(Platform)\</BaseOutputPath>+ <OutputPath>$(BaseOutputPath)$(MSBuildProjectName)\</OutputPath>+ <BaseIntermediateOutputPath>$(RepoRoot)obj\$(Platform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>+ <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>+ <GeneratedFilesDir>$(BaseIntermediateOutputPath)Generated Files\</GeneratedFilesDir><PackagesConfigRestorePath>$(RepoRoot)packages\</PackagesConfigRestorePath></PropertyGroup>diff --git a/src/dev/impl/DevToys/App.xaml.cs b/src/dev/impl/DevToys/App.xaml.csindex 948b91739..ec06b24c8 100644--- a/src/dev/impl/DevToys/App.xaml.cs+++ b/src/dev/impl/DevToys/App.xaml.cs@@ -19,6 +19,7 @@ using Windows.ApplicationModel.Core;using Windows.UI.ViewManagement;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;+using Windows.UI.Xaml.Media.Animation;using Windows.UI.Xaml.Navigation;namespace DevToys@@ -110,12 +111,28 @@ namespace DevToystypeof(MainPage),new NavigationParameter(mefComposer.ExportProvider.GetExport<IMefProvider>(),- query: e.Arguments));+ query: e.Arguments),+ new SuppressNavigationTransitionInfo());}// Ensure the current window is activeWindow.Current.Activate();}+ else+ {+ if (rootFrame.Content == null)+ {+ // When the navigation stack isn't restored navigate to the first page,+ // configuring the new page by passing required information as a navigation+ // parameter+ rootFrame.Navigate(+ typeof(MainPage),+ new NavigationParameter(+ mefComposer.ExportProvider.GetExport<IMefProvider>(),+ query: e.Arguments),+ new SuppressNavigationTransitionInfo());+ }+ }// Setup the title bar.mefComposer.ExportProvider.GetExport<ITitleBar>().SetupTitleBarAsync().Forget();@@ -186,6 +203,7 @@ namespace DevToys{// Create a Frame to act as the navigation context and navigate to the first pagerootFrame = new Frame();+ rootFrame.CacheSize = 10;rootFrame.NavigationFailed += OnNavigationFailed;// Place the frame in the current Windowdiff --git a/src/tests/DevToys.Tests/DevToys.Tests.csproj b/src/tests/DevToys.Tests/DevToys.Tests.csprojindex 5dc0e18a8..cff4c78f3 100644--- a/src/tests/DevToys.Tests/DevToys.Tests.csproj+++ b/src/tests/DevToys.Tests/DevToys.Tests.csproj@@ -18,6 +18,7 @@<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled><RestoreProjectStyle>PackageReference</RestoreProjectStyle><IsTestProject>true</IsTestProject>+ <AppxBundle>Never</AppxBundle></PropertyGroup><PropertyGroup Condition="'$(Configuration)' == 'Debug'"><DebugSymbols>true</DebugSymbols>