A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed build issue
Etienne Baudouxd159282b633a
diff --git a/src/dev/DevToys.Startup/DevToys.Startup.wapproj b/src/dev/DevToys.Startup/DevToys.Startup.wapprojindex 41466c523..8b929f3d6 100644--- a/src/dev/DevToys.Startup/DevToys.Startup.wapproj+++ b/src/dev/DevToys.Startup/DevToys.Startup.wapproj@@ -116,7 +116,7 @@<Content Include="Assets\Logo\Wide310x150Logo.scale-400.png" /></ItemGroup><ItemGroup>- <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(Windows10SDKVersion)" PrivateAssets="all" />+ <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(NuGet_MicrosoftWindowsSDKBuildTools)" PrivateAssets="all" /></ItemGroup><Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" /></Project>\ No newline at end of filediff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csprojindex 9227d9b5f..fb01dc4e9 100644--- a/src/dev/impl/DevToys/DevToys.csproj+++ b/src/dev/impl/DevToys/DevToys.csproj@@ -21,9 +21,126 @@<Compile Include="..\..\shared\SharedAssemblyInfo.cs"><Link>Properties\SharedAssemblyInfo.cs</Link></Compile>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\SplashScreen.scale-100.png">+ <Link>Assets\Logo\SplashScreen.scale-100.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\SplashScreen.scale-125.png">+ <Link>Assets\Logo\SplashScreen.scale-125.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\SplashScreen.scale-150.png">+ <Link>Assets\Logo\SplashScreen.scale-150.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\SplashScreen.scale-200.png">+ <Link>Assets\Logo\SplashScreen.scale-200.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\SplashScreen.scale-400.png">+ <Link>Assets\Logo\SplashScreen.scale-400.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square150x150Logo.scale-100.png">+ <Link>Assets\Logo\Square150x150Logo.scale-100.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square150x150Logo.scale-125.png">+ <Link>Assets\Logo\Square150x150Logo.scale-125.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square150x150Logo.scale-150.png">+ <Link>Assets\Logo\Square150x150Logo.scale-150.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square150x150Logo.scale-200.png">+ <Link>Assets\Logo\Square150x150Logo.scale-200.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square150x150Logo.scale-400.png">+ <Link>Assets\Logo\Square150x150Logo.scale-400.png</Link>+ </Content><Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png"><Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-16.png</Link></Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-24.png">+ <Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-24.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-256.png">+ <Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-256.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-32.png">+ <Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-32.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-48.png">+ <Link>Assets\Logo\Square44x44Logo.altform-lightunplated_targetsize-48.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-unplated_targetsize-16.png">+ <Link>Assets\Logo\Square44x44Logo.altform-unplated_targetsize-16.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-unplated_targetsize-24.png">+ <Link>Assets\Logo\Square44x44Logo.altform-unplated_targetsize-24.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-unplated_targetsize-256.png">+ <Link>Assets\Logo\Square44x44Logo.altform-unplated_targetsize-256.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-unplated_targetsize-32.png">+ <Link>Assets\Logo\Square44x44Logo.altform-unplated_targetsize-32.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.altform-unplated_targetsize-48.png">+ <Link>Assets\Logo\Square44x44Logo.altform-unplated_targetsize-48.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.scale-100.png">+ <Link>Assets\Logo\Square44x44Logo.scale-100.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.scale-125.png">+ <Link>Assets\Logo\Square44x44Logo.scale-125.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.scale-150.png">+ <Link>Assets\Logo\Square44x44Logo.scale-150.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.scale-200.png">+ <Link>Assets\Logo\Square44x44Logo.scale-200.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.scale-400.png">+ <Link>Assets\Logo\Square44x44Logo.scale-400.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.targetsize-16.png">+ <Link>Assets\Logo\Square44x44Logo.targetsize-16.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.targetsize-24.png">+ <Link>Assets\Logo\Square44x44Logo.targetsize-24.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.targetsize-256.png">+ <Link>Assets\Logo\Square44x44Logo.targetsize-256.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.targetsize-32.png">+ <Link>Assets\Logo\Square44x44Logo.targetsize-32.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Square44x44Logo.targetsize-48.png">+ <Link>Assets\Logo\Square44x44Logo.targetsize-48.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\StoreLogo.scale-100.png">+ <Link>Assets\Logo\StoreLogo.scale-100.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\StoreLogo.scale-125.png">+ <Link>Assets\Logo\StoreLogo.scale-125.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\StoreLogo.scale-150.png">+ <Link>Assets\Logo\StoreLogo.scale-150.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\StoreLogo.scale-200.png">+ <Link>Assets\Logo\StoreLogo.scale-200.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\StoreLogo.scale-400.png">+ <Link>Assets\Logo\StoreLogo.scale-400.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Wide310x150Logo.scale-100.png">+ <Link>Assets\Logo\Wide310x150Logo.scale-100.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Wide310x150Logo.scale-125.png">+ <Link>Assets\Logo\Wide310x150Logo.scale-125.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Wide310x150Logo.scale-150.png">+ <Link>Assets\Logo\Wide310x150Logo.scale-150.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Wide310x150Logo.scale-200.png">+ <Link>Assets\Logo\Wide310x150Logo.scale-200.png</Link>+ </Content>+ <Content Include="..\..\DevToys.Startup\Assets\Logo\Wide310x150Logo.scale-400.png">+ <Link>Assets\Logo\Wide310x150Logo.scale-400.png</Link>+ </Content><Content Include="Properties\Default.rd.rd.xml" /><Compile Include="Api\Core\IClipboard.cs" /><Compile Include="Api\Core\IMefProvider.cs" />@@ -282,7 +399,7 @@<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Behaviors" Version="$(Nuget_MicrosoftToolkitUwpUIBehaviors)" /><PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="$(Nuget_MicrosoftToolkitUwpUIControls)" /><PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />- <PackageReference Include="Newtonsoft.Json" Version="$(NuGet_NewtonsoftJson)"/>+ <PackageReference Include="Newtonsoft.Json" Version="$(NuGet_NewtonsoftJson)" /><PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" /></ItemGroup><ItemGroup>diff --git a/src/dev/shared/SharedAssemblyInfo.cs b/src/dev/shared/SharedAssemblyInfo.csindex a6aa849c4..ec39063ba 100644--- a/src/dev/shared/SharedAssemblyInfo.cs+++ b/src/dev/shared/SharedAssemblyInfo.cs@@ -34,7 +34,7 @@ using System.Runtime.CompilerServices;// You can specify all the values or you can default the Build and Revision Numbers// by using the '*' as shown below:// [assembly: AssemblyVersion("1.0.*")]-[assembly: AssemblyVersion("2021.09.26.0")]-[assembly: AssemblyFileVersion("2021.09.26.0")]+[assembly: AssemblyVersion("0.0.0.0")]+[assembly: AssemblyFileVersion("0.0.0.0")]-[assembly: InternalsVisibleTo("DevTools.Tests")]+[assembly: InternalsVisibleTo("DevToys.Tests")]diff --git a/src/tests/DevToys.Tests/DevToys.Tests.csproj b/src/tests/DevToys.Tests/DevToys.Tests.csprojindex fea4c0780..c6fff64e3 100644--- a/src/tests/DevToys.Tests/DevToys.Tests.csproj+++ b/src/tests/DevToys.Tests/DevToys.Tests.csproj@@ -17,6 +17,7 @@<UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion><AppxPackageSigningEnabled>false</AppxPackageSigningEnabled><RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>+ <RestoreProjectStyle>PackageReference</RestoreProjectStyle></PropertyGroup><ItemGroup><SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />@@ -59,6 +60,13 @@<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" /><PackageReference Include="MSTest.TestAdapter" Version="$(NuGet_MSTestTestAdapter)" /><PackageReference Include="MSTest.TestFramework" Version="$(NuGet_MSTestTestFramework)" />+ <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />+ </ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\..\dev\impl\DevToys\DevToys.csproj">+ <Project>{E3E4E200-B380-4207-9A7E-4C9421904502}</Project>+ <Name>DevToys</Name>+ </ProjectReference></ItemGroup><Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.diff --git a/src/tests/DevToys.Tests/UI/ConvertersTests.cs b/src/tests/DevToys.Tests/UI/ConvertersTests.csindex 2888b8d9a..63f3adcd7 100644--- a/src/tests/DevToys.Tests/UI/ConvertersTests.cs+++ b/src/tests/DevToys.Tests/UI/ConvertersTests.cs@@ -1,6 +1,4 @@-#nullable disable--using DevToys.UI.Converters;+using DevToys.UI.Converters;using Microsoft.VisualStudio.TestTools.UnitTesting;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;