Skip to content

Commit 469cd0c

Browse files
zhangxiang1993zhangxiang1993
authored
User/xianz/update sample 2 (#309)
* change output directory for AdapterSelection Sample * change output directory for Custom Operator Sample * change output directory for SqueezeNetObjectDetection Sample * Update test certificate for Emoji8 Sample * Update test certificate for MNIST_Demo Sample * Update test certificate for MNIST_Demo Sample * Update test certificate for FNSCandyStyleTransfer Sample * Update test certificate for SqueezeNetObjectDetection Sample * Update azure-pipelines-samples.yml for Azure Pipelines Check whether OS 18362 exists * check if OS18362 exists * revert relu_shader.h change * rename artifacts * temporary disabled build for squeezenet sample
1 parent f88ffb8 commit 469cd0c

19 files changed

+51
-42
lines changed

‎Samples/AdapterSelection/AdapterSelection/cpp/AdapterSelection.vcxproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,23 @@
101101
<PropertyGroup Label="UserMacros" />
102102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
103103
<LinkIncremental>true</LinkIncremental>
104+
<OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
104105
</PropertyGroup>
105106
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
106107
<LinkIncremental>true</LinkIncremental>
107-
<OutDir>$(Configuration)\</OutDir>
108+
<OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
108109
<IntDir>$(Configuration)\</IntDir>
109110
</PropertyGroup>
110111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
111112
<LinkIncremental>true</LinkIncremental>
112113
</PropertyGroup>
113114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
114115
<LinkIncremental>false</LinkIncremental>
116+
<OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
115117
</PropertyGroup>
116118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
117119
<LinkIncremental>false</LinkIncremental>
120+
<OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
118121
</PropertyGroup>
119122
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
120123
<LinkIncremental>false</LinkIncremental>
@@ -154,7 +157,7 @@
154157
<Link>
155158
<SubSystem>Console</SubSystem>
156159
<GenerateDebugInformation>true</GenerateDebugInformation>
157-
<AdditionalDependencies>$(SolutionDir)\$(Platform)\$(Configuration)\SampleSharedLib.lib;DXGI.lib;windowsapp.lib;ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
160+
<AdditionalDependencies>$(OutDir)\SampleSharedLib.lib;DXGI.lib;windowsapp.lib;ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
158161
</Link>
159162
</ItemDefinitionGroup>
160163
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -216,7 +219,7 @@
216219
<EnableCOMDATFolding>true</EnableCOMDATFolding>
217220
<OptimizeReferences>true</OptimizeReferences>
218221
<GenerateDebugInformation>true</GenerateDebugInformation>
219-
<AdditionalDependencies>$(SolutionDir)\$(Platform)\$(Configuration)\SampleSharedLib.lib;DXGI.lib;windowsapp.lib;ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
222+
<AdditionalDependencies>$(OutDir)\SampleSharedLib.lib;DXGI.lib;windowsapp.lib;ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
220223
</Link>
221224
</ItemDefinitionGroup>
222225
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">

‎Samples/CustomOperator/desktop/cpp/custom-operator-sample.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,22 @@
6464
</ImportGroup>
6565
<PropertyGroup Label="UserMacros" />
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67-
<OutDir>$(Platform)\$(Configuration)\</OutDir>
67+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
7070
<OutDir>$(Platform)\$(Configuration)\</OutDir>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
73-
<OutDir>$(Platform)\$(Configuration)\</OutDir>
73+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
7676
<OutDir>$(Platform)\$(Configuration)\</OutDir>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
79-
<OutDir>$(Configuration)\</OutDir>
79+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
82-
<OutDir>$(Configuration)\</OutDir>
82+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
8383
</PropertyGroup>
8484
<ItemDefinitionGroup>
8585
<ClCompile>
@@ -240,17 +240,17 @@
240240
<AdditionalIncludeDirectories>$(SolutionDir)\packages\rapidjson.v110.1.1.0\build\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
241241
</ResourceCompile>
242242
<Link>
243-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(SolutionDir)\$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
243+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
244244
</Link>
245245
<Link>
246-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(SolutionDir)\$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
246+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
247247
</Link>
248248
<Link>
249-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(SolutionDir)\$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
249+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
250250
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
251251
</Link>
252252
<Link>
253-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(SolutionDir)\$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
253+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;$(OutDir)\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
254254
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">ole32.lib;kernel32.lib;user32.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
255255
</Link>
256256
</ItemDefinitionGroup>

‎Samples/CustomOperator/desktop/cpp/operators/GeneratedShaders/relu_shader.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2578,4 +2578,4 @@ const BYTE g_Relu[] =
25782578
0, 0, 0, 0, 0, 0,
25792579
0, 0, 0, 0, 0, 0,
25802580
0, 0, 0, 0, 0, 0
2581-
};
2581+
};

‎Samples/Emoji8/UWP/cs/Emoji8/Emoji8.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
2222
<AppxBundle>Never</AppxBundle>
2323
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
24-
<PackageCertificateThumbprint>AEF8CDB5C6F65B590EC236F9692BB1BB89BEDA51</PackageCertificateThumbprint>
24+
<PackageCertificateThumbprint>72F563248BD86B45E37B328AFA3F809DDF0269CD</PackageCertificateThumbprint>
2525
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
2626
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
2727
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>

‎Samples/Emoji8/UWP/cs/Emoji8/Emoji8_TemporaryKey.pfx‎

0 Bytes
Binary file not shown.

‎Samples/FNSCandyStyleTransfer/UWP/cs/SnapCandy.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
2222
<AppxBundle>Never</AppxBundle>
2323
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
24-
<PackageCertificateThumbprint>71864B33C72C34F3EC08C77989B2DE1D92E780A5</PackageCertificateThumbprint>
24+
<PackageCertificateThumbprint>4A53C4DD7E437227E51F0CC01D27DF9427533DF8</PackageCertificateThumbprint>
2525
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
2626
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
2727
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>

‎Samples/FNSCandyStyleTransfer/UWP/cs/SnapCandy_TemporaryKey.pfx‎

0 Bytes
Binary file not shown.

‎Samples/MNIST/Tutorial/cs/MNIST_Demo.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
2020
<PackageCertificateKeyFile>MNIST_Demo_TemporaryKey.pfx</PackageCertificateKeyFile>
21+
<PackageCertificateThumbprint>3F8097E88490D10E949912F977C2261703380C54</PackageCertificateThumbprint>
2122
</PropertyGroup>
2223
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2324
<DebugSymbols>true</DebugSymbols>
@@ -134,6 +135,9 @@
134135
<Version>1.21.0</Version>
135136
</PackageReference>
136137
</ItemGroup>
138+
<ItemGroup>
139+
<None Include="MNIST_Demo_TemporaryKey.pfx" />
140+
</ItemGroup>
137141
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
138142
<VisualStudioVersion>14.0</VisualStudioVersion>
139143
</PropertyGroup>

‎Samples/MNIST/Tutorial/cs/MNIST_Demo_TemporaryKey.pfx‎

0 Bytes
Binary file not shown.

‎Samples/MNIST/UWP/cppcx/mnist_cppcx.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<PropertyGroup Label="UserMacros" />
9999
<PropertyGroup>
100100
<PackageCertificateKeyFile>mnist_cppcx_TemporaryKey.pfx</PackageCertificateKeyFile>
101-
<PackageCertificateThumbprint>B23CBDBC47A77064D6E6EF69178D43BD014FC24D</PackageCertificateThumbprint>
101+
<PackageCertificateThumbprint>34C79AC4198F40BB3EC5FB12F2CFD0DF00367BB9</PackageCertificateThumbprint>
102102
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
103103
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
104104
<AppxBundle>Never</AppxBundle>

0 commit comments

Comments
 (0)