Skip to content

Commit 21bf61e

Browse files
authored
Merge branch 'net10.0' into dateonly-datepicker
2 parents 5cfeca5 + f6079e7 commit 21bf61e

File tree

39 files changed

+1258
-586
lines changed

39 files changed

+1258
-586
lines changed

Directory.Build.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,8 @@
118118
Pack="true" />
119119
</ItemGroup>
120120
</Target>
121+
122+
<!-- Tell typescript to stop deleting everything before building the next TFM -->
123+
<Target Name="TypeScriptDeleteOutputFromOtherConfigs" />
124+
121125
</Project>

src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title></title>
77
<link rel="icon" href="data:,">
88
<link rel="stylesheet" href="styles/app.css">
9-
<script src="scripts/HybridWebView.js"></script>
9+
<script src="_framework/hybridwebview.js"></script>
1010
<script>
1111
function LogMessage(msg) {
1212
var messageLog = document.getElementById("messageLog");

src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/scripts/HybridWebView.js

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)