Skip to content

Commit 3cf2893

Browse files
authored
Merge pull request #598 from unoplatform/dev/nr/buildfix
2 parents 1d41784 + a89e6e1 commit 3cf2893

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

reference/SimpleCalc/MVU-X-CSharp/SimpleCalculator/SimpleCalculator.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<UnoImage Include="Assets\**\*.svg" />
6666
</ItemGroup>
6767

68-
<Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" />
68+
<!-- Disabling source code updating - uncomment and do build to update source code from shared resources -->
69+
<!-- <Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" /> -->
6970

7071
</Project>

reference/SimpleCalc/MVU-X-Xaml/SimpleCalculator/SimpleCalculator.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
6262
</ItemGroup>
6363

64-
<Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" />
64+
<!-- Disabling source code updating - uncomment and do build to update source code from shared resources -->
65+
<!-- <Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" /> -->
66+
6567

6668
</Project>

reference/SimpleCalc/MVVM-CSharp/SimpleCalculator/SimpleCalculator.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
<UnoImage Include="Assets\**\*.svg" />
6464
</ItemGroup>
6565

66-
<Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" />
66+
<!-- Disabling source code updating - uncomment and do build to update source code from shared resources -->
67+
<!-- <Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" /> -->
68+
6769

6870
</Project>

reference/SimpleCalc/MVVM-Xaml/SimpleCalculator/SimpleCalculator.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
6161
</ItemGroup>
6262

63-
<Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" />
63+
<!-- Disabling source code updating - uncomment and do build to update source code from shared resources -->
64+
<!-- <Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" /> -->
65+
6466

6567
</Project>

reference/SimpleCalc/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Updating SimpleCalc Source Code
2+
3+
There is a shared source code for all the SimpleCalc solutions that are in the `resources` folder. To update the source code, uncomment the `Import` element in the `SimpleCalculator.csproj` for the solution you want to make changes to. When the solution is built the relevant shared resources will be copied into the solution.
4+
5+
<!-- Disabling source code updating - uncomment and do build to update source code from shared resources -->
6+
<!-- <Import Project="..\..\resources\shared-resources.targets" Condition="Exists('..\..\resources\shared-resources.targets')" /> -->
7+
8+
Make changes to the shared source code in the `resources` folder and then build the solution. The shared source code will be copied into the solution. Commit the changes to the solution and the shared source code.
9+
10+
Don't forget to update the other solutions that will be affected eg if you make changes to the XAML, make sure both the XAML solutions are updated.

0 commit comments

Comments
 (0)