Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Flow CsWinRT version from versions.props #1916

Merged
merged 7 commits into from
Dec 17, 2021
Merged

Flow CsWinRT version from versions.props #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91eefc0
version.props
kythant Dec 16, 2021
90a461c
buidl directory props
kythant Dec 16, 2021
be8007c
Try this
kythant Dec 16, 2021
3f68605
remove this
kythant Dec 16, 2021
ec251f8
remove redundant import
kythant Dec 16, 2021
01aaae6
update this
kythant Dec 16, 2021
25fbd49
refactor
kythant Dec 17, 2021
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Adding Sdk="Microsoft.NET.Sdk" to a project causes NuGet files to be generated very early on, so we need these defines to be here
to ensure that all of our build output files end up in the same location. -->
<Project InitialTargets="DirectoryBuildPropsInfo" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="eng\Versions.props" />
<!-- Due to import ordering inconsistencies between different project types, we import this file from multiple places. -->
<Import Project="$(MSBuildThisFileDirectory)build\EnsureOutputLayout.props" Condition="$(EnsureOutputLayoutPropsIncluded) == ''" />

Expand Down
6 changes: 3 additions & 3 deletions dev/MRTCore/build/DownloadDotNetCoreSdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ param(
$dotnetInstallScript = "$env:TEMP\dotnet-install.ps1"

$repoInstallDir = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\.dotnet")
$versionPropsFilePropertyGroup = ([xml](Get-Content -Raw "$PSScriptRoot\versions.props")).Project.PropertyGroup[0]
$dotNetSdkVersion = $versionPropsFilePropertyGroup.DotNetCoreSdkVersion
$dotNetSdkVersionLkg = if (-not $skipLKG) { $versionPropsFilePropertyGroup.DotNetCoreSdkLkgVersion }
$versionPropsFilePropertyGroup = ([xml](Get-Content -Raw "$PSScriptRoot\..\..\..\eng\versions.props")).Project.PropertyGroup[0]
$dotNetSdkVersion = $versionPropsFilePropertyGroup.CsWinRTDependencyDotNetCoreSdkPackageVersion
$dotNetSdkVersionLkg = if (-not $skipLKG) { $versionPropsFilePropertyGroup.CsWinRTDependencyDotNetCoreSdkLkgPackageVersion }

if ($version -ne "")
{
Expand Down
41 changes: 0 additions & 41 deletions dev/MRTCore/build/versions.props
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...Model.Resources/projection/Microsoft.Windows.ApplicationModel.Resources.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<ItemGroup>
Expand All @@ -17,7 +17,7 @@

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.ApplicationModel.Resources</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
<NoWarn>MSB3271</NoWarn>
</PropertyGroup>

Expand Down
5 changes: 2 additions & 3 deletions ...ctions/CS/Microsoft.Windows.AppLifecycle/Microsoft.Windows.AppLifecycle.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand All @@ -16,12 +15,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.AppLifecycle</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
</PropertyGroup>

<!-- Configure the release build binary to be as required by internal API scanning tools. -->
Expand Down
5 changes: 2 additions & 3 deletions ....DynamicDependency/Microsoft.Windows.ApplicationModel.DynamicDependency.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand All @@ -16,12 +15,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.ApplicationModel.DynamicDependency</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
</PropertyGroup>

<!-- Configure the release build binary to be as required by internal API scanning tools. -->
Expand Down
5 changes: 2 additions & 3 deletions ....WindowsAppRuntime/Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand All @@ -16,12 +15,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.ApplicationModel.WindowsAppRuntime</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
</PropertyGroup>

<!-- Configure the release build binary to be as required by internal API scanning tools. -->
Expand Down
5 changes: 2 additions & 3 deletions ...indows.PushNotifications.Projection/Microsoft.Windows.PushNotifications.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand All @@ -16,12 +15,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.PushNotifications</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
</PropertyGroup>

<!-- Configure the release build binary to be as required by internal API scanning tools. -->
Expand Down
5 changes: 2 additions & 3 deletions ...ctions/CS/Microsoft.Windows.System.Power/Microsoft.Windows.System.Power.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand All @@ -16,12 +15,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.System.Power</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
</PropertyGroup>

<!-- Configure the release build binary to be as required by internal API scanning tools. -->
Expand Down
5 changes: 2 additions & 3 deletions dev/Projections/CS/Microsoft.Windows.System/Microsoft.Windows.System.Projection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
Expand All @@ -16,12 +15,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
</ItemGroup>

<PropertyGroup>
<CSWinRTIncludes>Microsoft.Windows.System</CSWinRTIncludes>
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
<CSWinRTWindowsMetadata>$(CsWinRTDependencyWindowsSdkPackagePackageVersion)</CSWinRTWindowsMetadata>
</PropertyGroup>

<!-- Configure the release build binary to be as required by internal API scanning tools. -->
Expand Down
16 changes: 16 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Windows.CsWinRT" Version="1.3.5">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha></Sha>
</Dependency>
<Dependency Name="CsWinRT.Dependency.DotNetCoreSdkn" Version="5.0.302">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha></Sha>
</Dependency>
<Dependency Name="CsWinRT.Dependency.DotNetCoreRuntime" Version="5.0.8">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha></Sha>
</Dependency>
<Dependency Name="CsWinRT.Dependency.WindowsSdkPackage" Version="10.0.17763.0">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha></Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.WinAppSDK.EngCommon" Version="1.0.0-20211213.0-CI">
Expand Down
7 changes: 6 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MicrosoftWindowsCsWinRTPackageVersion>1.3.5</MicrosoftWindowsCsWinRTPackageVersion>
<CsWinRTDependencyDotNetCoreSdkPackageVersion>5.0.302</CsWinRTDependencyDotNetCoreSdkPackageVersion>
<CsWinRTDependencyDotNetCoreRuntimePackageVersion>5.0.8</CsWinRTDependencyDotNetCoreRuntimePackageVersion>
<CsWinRTDependencyWindowsSdkPackagePackageVersion>10.0.17763.0</CsWinRTDependencyWindowsSdkPackagePackageVersion>
<CsWinRTDependencyDotNetCoreSdkLkgPackageVersion>5.0.302</CsWinRTDependencyDotNetCoreSdkLkgPackageVersion>
</PropertyGroup>
</Project>
</Project>