Merge pull request #500 from microsoft/user/nuform/gallery_release

Fix DXResource Binding Publish Crash & Update to DotNet 6

Author: nums11

Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest

@@ -9,7 +9,7 @@
   <Identity
     Name="MicrosoftCorporationII.WindowsMLSamplesGallery"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="1.0.7.0" />
+    Version="1.0.17.0" />
 
   <Properties>
     <DisplayName>Windows ML Samples Gallery</DisplayName>

Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj

@@ -44,12 +44,15 @@
     <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\WinMLSamplesGallery\WinMLSamplesGallery.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <PackageCertificateThumbprint>25067E5853327016828B1097611C6D97DAF9F5E8</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>57F96FCC00B6C183E454195CB67BE5961D5BCEBB</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
+  <PropertyGroup>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>

Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/DXResourceBindingORT/DXResourceBindingORT.xaml.cs

@@ -41,7 +41,8 @@ private async void LaunchWindow(object sender, RoutedEventArgs e)
             ToggleLaunchWindowButton();
             ToggleLoadingTxtVisibility();
 
-            await Task.Run(() => WinMLSamplesGalleryNative.DXResourceBinding.LaunchWindow());
+            var packagePath = Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
+            await Task.Run(() => WinMLSamplesGalleryNative.DXResourceBinding.LaunchWindow(packagePath));
 
             ToggleLoadingTxtVisibility();
             ClassifyCube();

Samples/WinMLSamplesGallery/WinMLSamplesGallery/WinMLSamplesGallery.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <RootNamespace>WinMLSamplesGallery</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -18,6 +18,9 @@
     <DefineConstants Condition="$(UseOpenCV)">$(DefineConstants);USE_OPENCV</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup>
+	<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Samples\EncryptedResource\**" />
     <EmbeddedResource Remove="Samples\EncryptedResource\**" />
@@ -30,6 +33,8 @@
   <ItemGroup>
     <None Remove="AllSamplesPage.xaml" />
     <None Remove="Controls\PerformanceMonitor.xaml" />
+    <None Remove="dx_preprocessor_efficient_net.onnx" />
+    <None Remove="efficientnet-lite4-11.onnx" />
     <None Remove="HomePage.xaml" />
     <None Remove="Models\fcn-resnet50-12.onnx" />
     <None Remove="Models\mosaic.onnx" />
@@ -43,9 +48,12 @@
     <None Remove="Samples\ObjectDetector\ObjectDetector.xaml" />
     <None Remove="Samples\OpenCVInterop\OpenCVInterop.xaml" />
     <None Remove="Samples\ImageSharpInterop\ImageSharpInterop.xaml" />
+    <None Remove="shaders.hlsl" />
     <None Remove="Video.xaml" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="dx_preprocessor_efficient_net.onnx" />
+    <Content Include="efficientnet-lite4-11.onnx" />
     <Content Include="Models\fcn-resnet50-12.onnx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -69,6 +77,7 @@
     <Content Include="Models\efficientnet-lite4-11.onnx" />
     <Content Include="Models\shufflenet-9.onnx" />
     <Content Include="Models\squeezenet1.1-7.onnx" />
+    <Content Include="shaders.hlsl" />
   </ItemGroup>
   <!-- Large Models -->
   <ItemGroup Condition="$(UseLargeModels)">

…allery/WinMLSamplesGalleryNative/cat.jpg …mplesGallery/WinMLSamplesGallery/cat.jpgSamples/WinMLSamplesGallery/WinMLSamplesGalleryNative/cat.jpg renamed to Samples/WinMLSamplesGallery/WinMLSamplesGallery/cat.jpg Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/cat.jpg renamed to Samples/WinMLSamplesGallery/WinMLSamplesGallery/cat.jpg

@@ -0,0 +1,25 @@
+#pragma once
+
+struct PSInput
+{
+    float4 position : SV_POSITION;
+    float2 uv : TEXCOORD;
+};
+
+Texture2D g_texture : register(t0);
+SamplerState g_sampler : register(s0);
+
+PSInput VSMain(float4 position : POSITION, float4 uv : TEXCOORD)
+{
+    PSInput result;
+
+    result.position = position;
+    result.uv = uv;
+
+    return result;
+}
+
+float4 PSMain(PSInput input) : SV_TARGET
+{
+    return g_texture.Sample(g_sampler, input.uv);
+}