Skip to content

Commit 62ee6a0

Browse files
greuelpiratKeboo
greuelpirat
and
Keboo
authored
Fixing NETSDK1106 by removing condition for UseWPF (followed by removing redundant ApplicationDefinition and Page) (#1742)
Co-authored-by: Kevin B <[email protected]>
1 parent a37d53f commit 62ee6a0

File tree

1 file changed

+0
-178
lines changed

1 file changed

+0
-178
lines changed

‎MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 0 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<Prefer32Bit>true</Prefer32Bit>
1515
<ApplicationIcon>favicon.ico</ApplicationIcon>
1616
<LangVersion>8.0</LangVersion>
17-
</PropertyGroup>
18-
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
1917
<UseWPF>true</UseWPF>
2018
</PropertyGroup>
2119
<Import Project="..\packages\ShowMeTheXAML.MSBuild\build\ShowMeTheXAML.MSBuild.targets" Label="Paket" />
@@ -38,182 +36,6 @@
3836
<Reference Include="WindowsBase" />
3937
<Reference Include="PresentationCore" />
4038
<Reference Include="PresentationFramework" />
41-
<ApplicationDefinition Include="App.xaml">
42-
<Generator>MSBuild:Compile</Generator>
43-
<SubType>Designer</SubType>
44-
</ApplicationDefinition>
45-
<Page Include="Buttons.xaml">
46-
<SubType>Designer</SubType>
47-
<Generator>MSBuild:Compile</Generator>
48-
</Page>
49-
<Page Include="Cards.xaml">
50-
<SubType>Designer</SubType>
51-
<Generator>MSBuild:Compile</Generator>
52-
</Page>
53-
<Page Include="Chips.xaml">
54-
<SubType>Designer</SubType>
55-
<Generator>MSBuild:Compile</Generator>
56-
</Page>
57-
<Page Include="ColorTool.xaml">
58-
<SubType>Designer</SubType>
59-
<Generator>MSBuild:Compile</Generator>
60-
</Page>
61-
<Page Include="ColorZones.xaml">
62-
<SubType>Designer</SubType>
63-
<Generator>MSBuild:Compile</Generator>
64-
</Page>
65-
<Page Include="Domain\DocumentationLinks.xaml">
66-
<SubType>Designer</SubType>
67-
<Generator>MSBuild:Compile</Generator>
68-
</Page>
69-
<Page Include="Domain\SampleMessageDialog.xaml">
70-
<SubType>Designer</SubType>
71-
<Generator>MSBuild:Compile</Generator>
72-
</Page>
73-
<Page Include="Drawers.xaml">
74-
<SubType>Designer</SubType>
75-
<Generator>MSBuild:Compile</Generator>
76-
</Page>
77-
<Page Include="Expander.xaml">
78-
<SubType>Designer</SubType>
79-
<Generator>MSBuild:Compile</Generator>
80-
</Page>
81-
<Page Include="Dialogs.xaml">
82-
<SubType>Designer</SubType>
83-
<Generator>MSBuild:Compile</Generator>
84-
</Page>
85-
<Page Include="Domain\Sample4Dialog.xaml">
86-
<Generator>MSBuild:Compile</Generator>
87-
<SubType>Designer</SubType>
88-
</Page>
89-
<Page Include="Domain\SampleDialog.xaml">
90-
<SubType>Designer</SubType>
91-
<Generator>MSBuild:Compile</Generator>
92-
</Page>
93-
<Page Include="Domain\SampleProgressDialog.xaml">
94-
<SubType>Designer</SubType>
95-
<Generator>MSBuild:Compile</Generator>
96-
</Page>
97-
<Page Include="Grids.xaml">
98-
<SubType>Designer</SubType>
99-
<Generator>MSBuild:Compile</Generator>
100-
</Page>
101-
<Page Include="GroupBoxes.xaml">
102-
<SubType>Designer</SubType>
103-
<Generator>MSBuild:Compile</Generator>
104-
</Page>
105-
<Page Include="Home.xaml">
106-
<SubType>Designer</SubType>
107-
<Generator>MSBuild:Compile</Generator>
108-
</Page>
109-
<Page Include="IconPack.xaml">
110-
<SubType>Designer</SubType>
111-
<Generator>MSBuild:Compile</Generator>
112-
</Page>
113-
<Page Include="Lists.xaml">
114-
<SubType>Designer</SubType>
115-
<Generator>MSBuild:Compile</Generator>
116-
</Page>
117-
<Page Include="MainWindow.xaml">
118-
<Generator>MSBuild:Compile</Generator>
119-
<SubType>Designer</SubType>
120-
</Page>
121-
<Page Include="MenusAndToolBars.xaml">
122-
<SubType>Designer</SubType>
123-
<Generator>MSBuild:Compile</Generator>
124-
</Page>
125-
<Page Include="Palette.xaml">
126-
<SubType>Designer</SubType>
127-
<Generator>MSBuild:Compile</Generator>
128-
</Page>
129-
<Page Include="PaletteSelector.xaml">
130-
<SubType>Designer</SubType>
131-
<Generator>MSBuild:Compile</Generator>
132-
</Page>
133-
<Page Include="Pickers.xaml">
134-
<SubType>Designer</SubType>
135-
<Generator>MSBuild:Compile</Generator>
136-
</Page>
137-
<Page Include="Progress.xaml">
138-
<SubType>Designer</SubType>
139-
<Generator>MSBuild:Compile</Generator>
140-
</Page>
141-
<Page Include="RatingBar.xaml">
142-
<Generator>MSBuild:Compile</Generator>
143-
<SubType>Designer</SubType>
144-
</Page>
145-
<Page Include="Shadows.xaml">
146-
<SubType>Designer</SubType>
147-
<Generator>MSBuild:Compile</Generator>
148-
</Page>
149-
<Page Include="Sliders.xaml">
150-
<SubType>Designer</SubType>
151-
<Generator>MSBuild:Compile</Generator>
152-
</Page>
153-
<Page Include="Snackbars.xaml">
154-
<SubType>Designer</SubType>
155-
<Generator>MSBuild:Compile</Generator>
156-
</Page>
157-
<Page Include="Fields.xaml">
158-
<SubType>Designer</SubType>
159-
<Generator>MSBuild:Compile</Generator>
160-
</Page>
161-
<Page Include="ComboBoxes.xaml">
162-
<SubType>Designer</SubType>
163-
<Generator>MSBuild:Compile</Generator>
164-
</Page>
165-
<Page Include="Toggles.xaml">
166-
<Generator>MSBuild:Compile</Generator>
167-
<SubType>Designer</SubType>
168-
</Page>
169-
<Page Include="Transitions.xaml">
170-
<SubType>Designer</SubType>
171-
<Generator>MSBuild:Compile</Generator>
172-
</Page>
173-
<Page Include="TransitionsDemo\Slide1_Intro.xaml">
174-
<SubType>Designer</SubType>
175-
<Generator>MSBuild:Compile</Generator>
176-
</Page>
177-
<Page Include="TransitionsDemo\Slide2_Intro.xaml">
178-
<SubType>Designer</SubType>
179-
<Generator>MSBuild:Compile</Generator>
180-
</Page>
181-
<Page Include="TransitionsDemo\Slide3_Intro.xaml">
182-
<SubType>Designer</SubType>
183-
<Generator>MSBuild:Compile</Generator>
184-
</Page>
185-
<Page Include="TransitionsDemo\Slide4_CombineTransitions.xaml">
186-
<SubType>Designer</SubType>
187-
<Generator>MSBuild:Compile</Generator>
188-
</Page>
189-
<Page Include="TransitionsDemo\Slide5_TransitioningContent.xaml">
190-
<SubType>Designer</SubType>
191-
<Generator>MSBuild:Compile</Generator>
192-
</Page>
193-
<Page Include="TransitionsDemo\Slide7_MVVM.xaml">
194-
<SubType>Designer</SubType>
195-
<Generator>MSBuild:Compile</Generator>
196-
</Page>
197-
<Page Include="TransitionsDemo\Slide6_Origins.xaml">
198-
<SubType>Designer</SubType>
199-
<Generator>MSBuild:Compile</Generator>
200-
</Page>
201-
<Page Include="TransitionsDemo\Slide8_Details.xaml">
202-
<SubType>Designer</SubType>
203-
<Generator>MSBuild:Compile</Generator>
204-
</Page>
205-
<Page Include="TransitionsDemo\TransitionsDemoHome.xaml">
206-
<SubType>Designer</SubType>
207-
<Generator>MSBuild:Compile</Generator>
208-
</Page>
209-
<Page Include="Trees.xaml">
210-
<SubType>Designer</SubType>
211-
<Generator>MSBuild:Compile</Generator>
212-
</Page>
213-
<Page Include="Typography.xaml">
214-
<SubType>Designer</SubType>
215-
<Generator>MSBuild:Compile</Generator>
216-
</Page>
21739
</ItemGroup>
21840
<ItemGroup>
21941
<Compile Include="..\paket-files\samueldjack\VirtualCollection\VirtualCollection\VirtualCollection\VirtualizingWrapPanel.cs">

0 commit comments

Comments
 (0)