Skip to content

Commit e2865a8

Browse files
rjmurillorjmurillo
committed
Merge branch 'fix_upgrade'
2 parents 80b3696 + 9043f7f commit e2865a8

File tree

224 files changed

+250
-1860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+250
-1860
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,22 @@
88
<IsWPFProject>$(MSBuildProjectName.Contains('WPF'))</IsWPFProject>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<Compile Include="..\Common.AssemblyInfo.cs">
11+
<Compile Include="$(MSBuildThisFileDirectory)\Common.AssemblyInfo.cs">
1212
<Link>Properties\Common.AssemblyInfo.cs</Link>
1313
</Compile>
14-
<Compile Include="..\Constants.cs">
14+
<Compile Include="$(MSBuildThisFileDirectory)\Constants.cs">
1515
<Link>Constants.cs</Link>
1616
</Compile>
17-
<Compile Include="..\GlobalSuppressions.cs">
17+
<Compile Include="$(MSBuildThisFileDirectory)\GlobalSuppressions.cs">
1818
<Link>GlobalSuppressions.cs</Link>
1919
</Compile>
2020
</ItemGroup>
2121
<ItemGroup>
2222
<PackageReference Include="StyleCop.Analyzers" Version="1.*" PrivateAssets="all" />
2323
<PackageReference Include="Nerdbank.GitVersioning" Version=" 2.*" PrivateAssets="all" />
24-
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="5.0.0-preview.gb86cb1c4cb" Condition="'$(IsFormsProject)' == 'true'" />
25-
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="5.0.0-preview.gb86cb1c4cb" Condition="'$(IsWPFProject)' == 'true'" />
2624
</ItemGroup>
2725
<ItemGroup>
28-
<AdditionalFiles Include="..\stylecop.json">
26+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json">
2927
<Link>stylecop.json</Link>
3028
</AdditionalFiles>
3129
</ItemGroup>

‎Toolkit/dotnet/Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<Import Project="../../Directory.Build.props" />
3+
<ItemGroup>
4+
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="5.0.0-preview.gb86cb1c4cb" Condition="'$(IsFormsProject)' == 'true'" />
5+
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="5.0.0-preview.gb86cb1c4cb" Condition="'$(IsWPFProject)' == 'true'" />
6+
</ItemGroup>
7+
</Project>

Microsoft.Toolkit.Win32.Samples.WPF.WebView/App.config renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/App.config

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/App.xaml renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/App.xaml

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/App.xaml.cs renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/App.xaml.cs

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/MainWindow.xaml renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/MainWindow.xaml

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/MainWindow.xaml.cs renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/MainWindow.xaml.cs

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/Properties/AssemblyInfo.cs renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/Properties/AssemblyInfo.cs

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/Properties/Resources.Designer.cs renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/Properties/Resources.Designer.cs

File renamed without changes.

Microsoft.Toolkit.Win32.Samples.WPF.WebView/Properties/Resources.resx renamed to Toolkit/dotnet/Microsoft.Toolkit.Win32.Samples.WPF.WebView/Properties/Resources.resx

File renamed without changes.

0 commit comments

Comments
 (0)