Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Windows SDK dependency as NuGet packages #109

Merged
michael-hawker merged 13 commits into from
Apr 20, 2019
Merged

Windows SDK dependency as NuGet packages #109

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
887b0da
Added WinSDK contracts NuGet.
azchohfi Jan 28, 2019
9a62746
Merge branch '6.0.0' into winSDKContracts
azchohfi Feb 8, 2019
752620a
Updated to correct Windows SDK package.
azchohfi Feb 20, 2019
029ce3b
Removed local packages source.
azchohfi Feb 20, 2019
9391412
Merge branch '6.0.0' into winSDKContracts
azchohfi Feb 26, 2019
df8e198
Merge branch '6.0.0' into winSDKContracts
Mar 5, 2019
c006156
Merge branch '6.0.0' into winSDKContracts
azchohfi Apr 4, 2019
ee4d6c7
Merge branch '6.0.0' into winSDKContracts
azchohfi Apr 4, 2019
5d4f9a1
Merge branch 'master' into winSDKContracts
azchohfi Apr 10, 2019
ab16efe
Updated to latest stable version.
azchohfi Apr 19, 2019
a85f22d
Updated to NuGet 5.0.0
azchohfi Apr 20, 2019
778b4f1
Removed unused powershell scripts.
azchohfi Apr 20, 2019
5a63903
Sample apps and Tests marked as not packable.
azchohfi Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

<!-- Need 19H1 or later.

When changing this value, ensure the SDK is installed with the build process.
Need to check several files:
- /azure-pipelines.yml

This also needs to be installed on your local machine. Can do this with PowerShell:
./build/Install-WindowsSDKISO.ps1 18362
-->
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<!-- XAML Islands require SDK 18226 -->
<!-- XAML Islands require SDK 18226 -->
<TargetPlatformMinVersion>10.0.18226.0</TargetPlatformMinVersion>

<!-- Compiler -->
Expand Down
11 changes: 1 addition & 10 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="all"/>
<Reference Include="Windows">
<HintPath Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformMinVersion)\Windows.winmd')">$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformMinVersion)\Windows.winmd</HintPath>
<HintPath Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformVersion)\Windows.winmd')">$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformVersion)\Windows.winmd</HintPath>
<IsWinMDFile>true</IsWinMDFile>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview3.19128.7" />
<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml" Version="4.6.0-preview3.19128.7" />
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
</ItemGroup>
</When>
</Choose>
Expand Down
3 changes: 0 additions & 3 deletions ...soft.Toolkit.Forms.UI.Controls.WebView/Microsoft.Toolkit.Forms.UI.Controls.WebView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
<Reference Include="System.Net.Http">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions Microsoft.Toolkit.Forms.UI.Controls/Microsoft.Toolkit.Forms.UI.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<PackageReference Include="System.Net.Http" Version="4.0.0" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 0 additions & 6 deletions Microsoft.Toolkit.Forms.UI.XamlHost/Microsoft.Toolkit.Forms.UI.XamlHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.WindowsRuntime.UI.Xaml">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.UI.Xaml.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
17 changes: 0 additions & 17 deletions Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,13 @@
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="UIAutomationProvider" />
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.WindowsRuntime.UI.Xaml">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.UI.Xaml.dll</HintPath>
</Reference>
<Reference Include="Windows">
<HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.18362.0\Windows.winmd</HintPath>
<IsWinMDFile>true</IsWinMDFile>
<Private>false</Private>
</Reference>
</ItemGroup>

<ItemGroup>
<None Include="app.manifest" />
<None Include="App.config" />
Expand Down
4 changes: 1 addition & 3 deletions Microsoft.Toolkit.Sample.Wpf.App/Microsoft.Toolkit.Sample.Wpf.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<Description>Sample Code for Windows Community Toolkit Controls</Description>
<StartupObject>Microsoft.Toolkit.Sample.Wpf.App.Program</StartupObject>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
Expand All @@ -23,9 +24,6 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Sample.Wpf.App/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum StartupKind
[STAThread]
public static void Main()
{
var startupKind = StartupKind.Normal;
Copy link
Member

@michael-hawker michael-hawker Apr 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this the part you said wasn't supported anymore? Should we have a comment here calling that this must be set this way and throw an exception in the else case below?

Copy link
Contributor Author

@azchohfi azchohfi Apr 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the else clause. It doesn't work. There will be a future PR with a more complex scenario covered.

var startupKind = StartupKind.MultiThread;

if (startupKind == StartupKind.CustomAppSettings)
{
Expand Down
3 changes: 0 additions & 3 deletions Microsoft.Toolkit.Wpf.UI.Controls.WebView/Microsoft.Toolkit.Wpf.UI.Controls.WebView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions Microsoft.Toolkit.Wpf.UI.Controls/Microsoft.Toolkit.Wpf.UI.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 0 additions & 6 deletions Microsoft.Toolkit.Wpf.UI.XamlHost/Microsoft.Toolkit.Wpf.UI.XamlHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.WindowsRuntime">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.WindowsRuntime.UI.Xaml">
<HintPath>$(WINDIR)\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.UI.Xaml.dll</HintPath>
</Reference>
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<Reference Include="System.Management" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="System.Management" Version="4.6.0-preview3.19128.7" />
<PackageReference Include="System.Management" Version="4.6.0-preview4.19212.13" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Microsoft.Toolkit.Win32.UI.Controls\Interop\Win32\ExternDll.cs" Link="ExternDll.cs" />
Expand Down
9 changes: 3 additions & 6 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ steps:
displayName: Setup Environment Variables

- task: NuGetToolInstaller@0
displayName: Use NuGet 4.7.0
displayName: Use NuGet 5.0.0
inputs:
versionSpec: 4.7.0
versionSpec: 5.0.0

- task: DotNetCoreInstaller@0
inputs:
packageType: 'sdk'
version: '3.0.100-preview3-010431'
version: '3.0.100-preview4-011223'
displayName: Install Dot Net Core SDK 3.0

- task: DotNetCoreCLI@2
Expand All @@ -41,9 +41,6 @@ steps:
- script: nbgv cloud
displayName: Set Version

- powershell: .\build\Install-WindowsSdkISO.ps1 18362
displayName: Insider SDK

- powershell: .\build\build.ps1 -target=Package
displayName: Build

Expand Down
1 change: 0 additions & 1 deletion build/Find-WindowsSDKVersions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ foreach($version in $versions) {
$installRequired = Test-InstallWindowsSDK $version
Write-Host "Windows SDK '$version' install required: $installRequired"
if ($installRequired) {
# Automatically invoke Install-WindowsSDKIso.ps1 ?
$anyInstallRequired = $true
}
}
Expand Down
6 changes: 0 additions & 6 deletions build/Install-WindowsSDK.ps1
View file
Open in desktop

This file was deleted.

Loading