Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ComputeSharp.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<File Path=".globalconfig" />
<File Path="build/Directory.Build.props" />
<File Path="build/Directory.Build.targets" />
<File Path="Directory.Packages.props" />
<File Path="global.json" />
<File Path="LICENSE" />
<File Path="README.md" />
Expand Down
39 changes: 39 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="AutoConstructor" Version="5.6.0" />
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.11" />
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.250402" />
<PackageVersion Include="CommunityToolkit.Uwp.Media" Version="8.2.250402" />
<PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.3.260402-preview2" />
<PackageVersion Include="CommunityToolkit.WinUI.Media" Version="8.3.260402-preview2" />
<PackageVersion Include="ComputeSharp" Version="$(PackageVersion)" />
<PackageVersion Include="ComputeSharp.Core" Version="$(PackageVersion)" />
<PackageVersion Include="ComputeSharp.Dxc" Version="$(PackageVersion)" />
<PackageVersion Include="ComputeSharp.Pix" Version="$(PackageVersion)" />
<PackageVersion Include="FSharp.Core" Version="9.0.202" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.4.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.333" />
<PackageVersion Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="2.1.6" />
<PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="2.4.0" />
<PackageVersion Include="Microsoft.WindowsAppSDK.WinUI" Version="2.3.6" />
<PackageVersion Include="MSTest" Version="3.8.3" />
<PackageVersion Include="PublishAotCompressed" Version="1.0.2" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageVersion Include="TerraFX.Interop.D3D12MemoryAllocator" Version="2.0.1.5" />
<PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
<PackageVersion Include="Win2D.uwp" Version="1.28.3" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions samples/ComputeSharp.Benchmark/ComputeSharp.Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="SixLabors.ImageSharp" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="SixLabors.ImageSharp" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="9.0.202" />
<PackageReference Include="FSharp.Core" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<!-- If requested, also reference the UPX compression package -->
<ItemGroup Condition="'$(PUBLISH_AOT_COMPRESSED)' == 'true'">
<PackageReference Include="PublishAotCompressed" Version="1.0.2" />
<PackageReference Include="PublishAotCompressed" />
</ItemGroup>

<ItemGroup>
Expand All @@ -58,7 +58,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
<PackageReference Include="TerraFX.Interop.Windows" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
<PackageReference Include="TerraFX.Interop.Windows" />
</ItemGroup>

<!-- Note: using SetPlatform="Platform=AnyCPU" for the analyzers to avoid issues (see https://github.com/dotnet/roslyn/issues/70148) -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.250402" />
<PackageReference Include="CommunityToolkit.Uwp.Media" Version="8.2.250402" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" />
<PackageReference Include="CommunityToolkit.Uwp.Media" />

<!-- Remove all WebView2 assets (transitive from WinUI 2), since we don't need it at all -->
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" IncludeAssets="none" />
<PackageReference Include="Microsoft.Web.WebView2" IncludeAssets="none" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.3.260402-preview2" />
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.3.260402-preview2" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
<PackageReference Include="CommunityToolkit.WinUI.Media" />

<!--
This app is packaged and uses the framework dependent deployment model, so it needs the Windows App SDK
Expand All @@ -40,8 +40,8 @@
a newer 'Microsoft.WindowsAppSDK.InteractiveExperiences' than the one 'Microsoft.WindowsAppSDK.WinUI' pulls
in. Reference it explicitly to line the two up, which is also what the aggregate package resolves to.
-->
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="2.1.6" />
<PackageReference Include="Microsoft.WindowsAppSDK.Runtime" Version="2.4.0" />
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" />
<PackageReference Include="Microsoft.WindowsAppSDK.Runtime" />
</ItemGroup>

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
<PackageReference Include="TerraFX.Interop.Windows" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.CodeFixers/ComputeSharp.CodeFixers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" Pack="false" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.333" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.Windows.CsWin32" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" Pack="false" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.D2D1.Uwp/ComputeSharp.D2D1.Uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Win2D.uwp" Version="1.28.3" />
<PackageReference Include="Win2D.uwp" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" Pack="false" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.D2D1.WinUI/ComputeSharp.D2D1.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.4.0" />
<PackageReference Include="Microsoft.Graphics.Win2D" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="TerraFX.Interop.D3D12MemoryAllocator" Version="2.0.1.5" />
<PackageReference Include="TerraFX.Interop.D3D12MemoryAllocator" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.333" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.Windows.CsWin32" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="2.3.6" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSTest" Version="3.8.3" />
<PackageReference Include="MSTest" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Basic.Reference.Assemblies.Net100" Version="1.8.11" />
<PackageReference Include="MSTest" Version="3.8.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Basic.Reference.Assemblies.Net100" />
<PackageReference Include="MSTest" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoConstructor" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="MSTest" Version="3.8.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
<PackageReference Include="AutoConstructor" PrivateAssets="all" />
<PackageReference Include="MSTest" />
<PackageReference Include="SixLabors.ImageSharp" />
<PackageReference Include="TerraFX.Interop.Windows" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Basic.Reference.Assemblies.Net100" Version="1.8.11" />
<PackageReference Include="MSTest" Version="3.8.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
<PackageReference Include="Basic.Reference.Assemblies.Net100" />
<PackageReference Include="MSTest" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoConstructor" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" ExcludeAssets="build" />
<PackageReference Include="MSTest" Version="3.8.3" />
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
<PackageReference Include="AutoConstructor" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" ExcludeAssets="build" />
<PackageReference Include="MSTest" />
<PackageReference Include="TerraFX.Interop.Windows" />

<!--
Same as in 'ComputeSharp.SwapChain.WinUI': this test app is packaged and framework dependent, so it needs
the Windows App SDK runtime package for the MSIX framework dependency. It does not reference any of the
WinUI packages itself (it only gets Win2D through 'ComputeSharp.D2D1.WinUI'), so the components the runtime
package expects are referenced explicitly here as well.
-->
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="2.1.6" />
<PackageReference Include="Microsoft.WindowsAppSDK.Runtime" Version="2.4.0" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="2.3.6" />
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" />
<PackageReference Include="Microsoft.WindowsAppSDK.Runtime" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions tests/ComputeSharp.Dxc.NuGet/ComputeSharp.Dxc.NuGet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ComputeSharp.Core" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp.Dxc" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp.Core" />
<PackageReference Include="ComputeSharp" />
<PackageReference Include="ComputeSharp.Dxc" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/ComputeSharp.NuGet/ComputeSharp.NuGet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ComputeSharp.Core" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp.Core" />
<PackageReference Include="ComputeSharp" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions tests/ComputeSharp.Pix.NuGet/ComputeSharp.Pix.NuGet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ComputeSharp.Core" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp.Pix" Version="$(PackageVersion)" />
<PackageReference Include="ComputeSharp.Core" />
<PackageReference Include="ComputeSharp" />
<PackageReference Include="ComputeSharp.Pix" />
</ItemGroup>
</Project>
Loading
Loading