-
Notifications
You must be signed in to change notification settings - Fork 338
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Consolidate ProjectReferences and clean csprojs (#3602)
- Loading branch information
Showing
8 changed files
with
145 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,100 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="$(SolutionDir)ToolingVersions.props" /> | ||
| <!-- Debug builds produce a console app; otherwise a Windows app --> | ||
| <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> | ||
| <OutputType>Exe</OutputType> | ||
| <Configurations>Debug;Release;Debug_FailFast</Configurations> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)'=='Debug_FailFast'"> | ||
| <OutputType>Exe</OutputType> | ||
| <Configurations>Debug;Release;Debug_FailFast</Configurations> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)' != 'Debug'"> | ||
| <OutputType>WinExe</OutputType> | ||
| </PropertyGroup> | ||
| <Import Project="$(SolutionDir)ToolingVersions.props" /> | ||
| <!-- Debug builds produce a console app; otherwise a Windows app --> | ||
| <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> | ||
| <OutputType>Exe</OutputType> | ||
| <Configurations>Debug;Release;Debug_FailFast</Configurations> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)'=='Debug_FailFast'"> | ||
| <OutputType>Exe</OutputType> | ||
| <Configurations>Debug;Release;Debug_FailFast</Configurations> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)' != 'Debug'"> | ||
| <OutputType>WinExe</OutputType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <Platforms>x86;x64;arm64</Platforms> | ||
| <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| <StartupObject>WSLExtension.Program</StartupObject> | ||
| <AssemblyName>WSLExtensionServer</AssemblyName> | ||
| <PublishProfileFullPath Condition="'$(BuildingInsideVisualStudio)' != 'True'">$(SolutionDir)\src\Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfileFullPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <Platforms>x86;x64;arm64</Platforms> | ||
| <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| <StartupObject>WSLExtension.Program</StartupObject> | ||
| <AssemblyName>WSLExtensionServer</AssemblyName> | ||
| <PublishProfileFullPath Condition="'$(BuildingInsideVisualStudio)' != 'True'">$(SolutionDir)\src\Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfileFullPath> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.700.544" /> | ||
| <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" /> | ||
| <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog" Version="3.1.1" /> | ||
| <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> | ||
| <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> | ||
| <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> | ||
| <PackageReference Include="YamlDotNet" Version="15.1.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" /> | ||
| <PackageReference Include="System.Management" Version="8.0.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.700.544" /> | ||
| <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" /> | ||
| <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog" Version="3.1.1" /> | ||
| <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> | ||
| <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> | ||
| <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> | ||
| <PackageReference Include="YamlDotNet" Version="15.1.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" /> | ||
| <PackageReference Include="System.Management" Version="8.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="DistributionDefinitions\DistributionDefinition.yaml"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="WslTemplates\ReviewFormForWslInstallation.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="WslTemplates\WslInstallationForm.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="DistributionDefinitions\DistributionDefinition.yaml"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="WslTemplates\ReviewFormForWslInstallation.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| <Content Include="WslTemplates\WslInstallationForm.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Update="wsl_appsettings.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Update="wsl_appsettings.json"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FailFast|x64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FailFast|x64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FailFast|x86'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FailFast|x86'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FailFast|ARM64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FailFast|ARM64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> | ||
| <DebugType>portable</DebugType> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 23 additions & 23 deletions
46
...Home.Services.DesiredStateConfiguration/DevHome.Services.DesiredStateConfiguration.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="$(SolutionDir)ToolingVersions.props" /> | ||
| <PropertyGroup> | ||
| <RootNamespace>DevHome.Services.DesiredStateConfiguration</RootNamespace> | ||
| <Platforms>x86;x64;arm64</Platforms> | ||
| <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| </PropertyGroup> | ||
| <Import Project="$(SolutionDir)ToolingVersions.props" /> | ||
| <PropertyGroup> | ||
| <RootNamespace>DevHome.Services.DesiredStateConfiguration</RootNamespace> | ||
| <Platforms>x86;x64;arm64</Platforms> | ||
| <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="$(TargetDir)\Microsoft.Management.Configuration.dll" Link="Microsoft.Management.Configuration.dll" CopyToOutputDirectory="PreserveNewest" /> | ||
| <Content Include="$(TargetDir)\Microsoft.Management.Configuration.winmd" Link="Microsoft.Management.Configuration.winmd" CopyToOutputDirectory="PreserveNewest" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="$(TargetDir)\Microsoft.Management.Configuration.dll" Link="Microsoft.Management.Configuration.dll" CopyToOutputDirectory="PreserveNewest" /> | ||
| <Content Include="$(TargetDir)\Microsoft.Management.Configuration.winmd" Link="Microsoft.Management.Configuration.winmd" CopyToOutputDirectory="PreserveNewest" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.WindowsPackageManager.Configuration.OutOfProc" Version="1.7.10091-preview" GeneratePathProperty="True" /> | ||
| <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.WindowsPackageManager.Configuration.OutOfProc" Version="1.7.10091-preview" GeneratePathProperty="True" /> | ||
| <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\DevHome.Services.Core\DevHome.Services.Core.csproj" /> | ||
| </ItemGroup> | ||
| <Target Name="CopyWinmdToTargetDir" BeforeTargets="BeforeBuild"> | ||
| <Copy SourceFiles="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win10-$(Platform)\native\Microsoft.Management.Configuration.dll" DestinationFolder="$(TargetDir)" /> | ||
| <Copy SourceFiles="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win10-$(Platform)\native\Microsoft.Management.Configuration.winmd" DestinationFolder="$(TargetDir)" /> | ||
| </Target> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\DevHome.Services.Core\DevHome.Services.Core.csproj" /> | ||
| </ItemGroup> | ||
| <Target Name="CopyWinmdToTargetDir" BeforeTargets="BeforeBuild"> | ||
| <Copy SourceFiles="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win10-$(Platform)\native\Microsoft.Management.Configuration.dll" DestinationFolder="$(TargetDir)" /> | ||
| <Copy SourceFiles="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win10-$(Platform)\native\Microsoft.Management.Configuration.winmd" DestinationFolder="$(TargetDir)" /> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters