Skip to content

Commit 86482af

Browse files
committed
Update to use dotnet 6
1 parent 3115fa6 commit 86482af

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Identity
1010
Name="MicrosoftCorporationII.WindowsMLSamplesGallery"
1111
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
12-
Version="1.0.8.0" />
12+
Version="1.0.17.0" />
1313

1414
<Properties>
1515
<DisplayName>Windows ML Samples Gallery</DisplayName>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,15 @@
4444
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
4545
<EntryPointProjectUniqueName>..\WinMLSamplesGallery\WinMLSamplesGallery.csproj</EntryPointProjectUniqueName>
4646
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
47-
<PackageCertificateThumbprint>A22BAAEE253C6FB6D2972C02E0B1945C85644F89</PackageCertificateThumbprint>
47+
<PackageCertificateThumbprint>57F96FCC00B6C183E454195CB67BE5961D5BCEBB</PackageCertificateThumbprint>
4848
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
4949
<GenerateTestArtifacts>True</GenerateTestArtifacts>
50-
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
50+
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
5151
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
5252
</PropertyGroup>
53+
<PropertyGroup>
54+
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
55+
</PropertyGroup>
5356
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
5457
<AppxBundle>Always</AppxBundle>
5558
</PropertyGroup>

Samples/WinMLSamplesGallery/WinMLSamplesGallery/WinMLSamplesGallery.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
66
<RootNamespace>WinMLSamplesGallery</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -18,6 +18,9 @@
1818
<DefineConstants Condition="$(UseOpenCV)">$(DefineConstants);USE_OPENCV</DefineConstants>
1919
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2020
</PropertyGroup>
21+
<PropertyGroup>
22+
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
23+
</PropertyGroup>
2124
<ItemGroup>
2225
<Compile Remove="Samples\EncryptedResource\**" />
2326
<EmbeddedResource Remove="Samples\EncryptedResource\**" />

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative.Interop/WinMLSamplesGalleryNative.Interop.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<ProjectName>WinMLSamplesGalleryNative.Interop</ProjectName>
5-
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
5+
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
66
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<Platforms>x86;x64;arm64;</Platforms>

0 commit comments

Comments
 (0)