Skip to content

Commit 7836bdd

Browse files
TyrrrzTyrrrz
committed
Update packages and format
1 parent 7f94745 commit 7836bdd

File tree

11 files changed

+167
-107
lines changed

11 files changed

+167
-107
lines changed

‎DotnetRuntimeBootstrapper.AppHost.Cli/DotnetRuntimeBootstrapper.AppHost.Cli.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<TargetFramework>net35</TargetFramework>
65
<ApplicationIcon>../favicon.ico</ApplicationIcon>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<Compile Include="../DotnetRuntimeBootstrapper.AppHost.Core/**/*.cs" Exclude="**/bin/**/*.cs;**/obj/**/*.cs" Visible="false" />
9+
<Compile
10+
Include="../DotnetRuntimeBootstrapper.AppHost.Core/**/*.cs"
11+
Exclude="**/bin/**/*.cs;**/obj/**/*.cs"
12+
Visible="false"
13+
/>
1114
<None Include="../DotnetRuntimeBootstrapper.AppHost.Core/*.config" Visible="false" />
1215
</ItemGroup>
1316

1417
<ItemGroup>
15-
<PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
18+
<PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
1619
<PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
1720
<PackageReference Include="QuickJson" Version="1.1.0" PrivateAssets="all" />
1821
</ItemGroup>
1922

2023
<ItemGroup>
2124
<Reference Include="System.Management" />
2225
</ItemGroup>
23-
24-
</Project>
26+
</Project>

‎DotnetRuntimeBootstrapper.AppHost.Core/App.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
32
<!-- This configuration file is required by the apphost which runs on legacy .NET Framework for compatibility reasons -->
43

4+
55
<configuration>
6-
<!-- Prefer .NET 3.5 (preinstalled on Windows 7), rollover to .NET 4.x (preinstalled on Windows 8+) -->
7-
<startup useLegacyV2RuntimeActivationPolicy="true">
8-
<supportedRuntime version="v2.0.50727" />
9-
<supportedRuntime version="v4.0" />
10-
</startup>
11-
</configuration>
6+
<!-- Prefer .NET 3.5 (preinstalled on Windows 7), rollover to .NET 4.x (preinstalled on Windows 8+) -->
7+
<startup useLegacyV2RuntimeActivationPolicy="true">
8+
<supportedRuntime version="v2.0.50727" />
9+
<supportedRuntime version="v4.0" />
10+
</startup>
11+
</configuration>

‎DotnetRuntimeBootstrapper.AppHost.Core/DotnetRuntimeBootstrapper.AppHost.Core.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net35</TargetFramework>
54
</PropertyGroup>
65

76
<ItemGroup>
8-
<PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
7+
<PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
98
<PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
109
<PackageReference Include="QuickJson" Version="1.1.0" PrivateAssets="all" />
1110
</ItemGroup>
1211

1312
<ItemGroup>
1413
<Reference Include="System.Management" />
1514
</ItemGroup>
16-
17-
</Project>
15+
</Project>

‎DotnetRuntimeBootstrapper.AppHost.Gui/DotnetRuntimeBootstrapper.AppHost.Gui.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>WinExe</OutputType>
54
<TargetFramework>net35</TargetFramework>
@@ -8,18 +7,21 @@
87
</PropertyGroup>
98

109
<ItemGroup>
11-
<Compile Include="../DotnetRuntimeBootstrapper.AppHost.Core/**/*.cs" Exclude="**/bin/**;**/obj/**" Visible="false" />
10+
<Compile
11+
Include="../DotnetRuntimeBootstrapper.AppHost.Core/**/*.cs"
12+
Exclude="**/bin/**;**/obj/**"
13+
Visible="false"
14+
/>
1215
<None Include="../DotnetRuntimeBootstrapper.AppHost.Core/*.config" Visible="false" />
1316
</ItemGroup>
1417

1518
<ItemGroup>
16-
<PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
19+
<PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
1720
<PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
1821
<PackageReference Include="QuickJson" Version="1.1.0" PrivateAssets="all" />
1922
</ItemGroup>
2023

2124
<ItemGroup>
2225
<Reference Include="System.Management" />
2326
</ItemGroup>
24-
25-
</Project>
27+
</Project>

‎DotnetRuntimeBootstrapper.Demo.Cli/DotnetRuntimeBootstrapper.Demo.Cli.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<!-- Props/targets are automatically imported by NuGet, but here we need to do it manually. -->
43
<!-- This needs to be done before any other props or targets, to match NuGet's behavior. -->
54
<Import Project="../DotnetRuntimeBootstrapper/DotnetRuntimeBootstrapper.Local.props" />
@@ -14,11 +13,10 @@
1413
</PropertyGroup>
1514

1615
<ItemGroup>
17-
<PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
16+
<PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
1817
</ItemGroup>
1918

2019
<ItemGroup>
2120
<ProjectReference Include="..\DotnetRuntimeBootstrapper\DotnetRuntimeBootstrapper.csproj" />
2221
</ItemGroup>
23-
24-
</Project>
22+
</Project>

‎DotnetRuntimeBootstrapper.Demo.Gui/DotnetRuntimeBootstrapper.Demo.Gui.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<!-- Props/targets are automatically imported by NuGet, but here we need to do it manually. -->
43
<!-- This needs to be done before any other props or targets, to match NuGet's behavior. -->
54
<Import Project="../DotnetRuntimeBootstrapper/DotnetRuntimeBootstrapper.Local.props" />
@@ -16,11 +15,10 @@
1615
</PropertyGroup>
1716

1817
<ItemGroup>
19-
<PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
18+
<PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
2019
</ItemGroup>
2120

2221
<ItemGroup>
2322
<ProjectReference Include="..\DotnetRuntimeBootstrapper\DotnetRuntimeBootstrapper.csproj" />
2423
</ItemGroup>
25-
26-
</Project>
24+
</Project>

‎DotnetRuntimeBootstrapper.Demo.Gui/Manifest.xml‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3-
<assemblyIdentity version="1.0.0.0" name="DotnetRuntimeBootstrapper.Demo.Gui"/>
4-
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5-
<security>
6-
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7-
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
8-
</requestedPrivileges>
9-
</security>
10-
</trustInfo>
3+
<assemblyIdentity version="1.0.0.0" name="DotnetRuntimeBootstrapper.Demo.Gui" />
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
8+
</requestedPrivileges>
9+
</security>
10+
</trustInfo>
1111

12-
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
13-
<application>
14-
<!-- Windows Vista -->
15-
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
12+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
13+
<application>
14+
<!-- Windows Vista -->
15+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
1616

17-
<!-- Windows 7 -->
18-
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
17+
<!-- Windows 7 -->
18+
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
1919

20-
<!-- Windows 8 -->
21-
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
20+
<!-- Windows 8 -->
21+
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
2222

23-
<!-- Windows 8.1 -->
24-
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
23+
<!-- Windows 8.1 -->
24+
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
2525

26-
<!-- Windows 10 -->
27-
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
26+
<!-- Windows 10 -->
27+
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
28+
</application>
29+
</compatibility>
2830

29-
</application>
30-
</compatibility>
31-
32-
<dependency>
33-
<dependentAssembly>
34-
<assemblyIdentity
35-
type="win32"
36-
name="Microsoft.Windows.Common-Controls"
37-
version="6.0.0.0"
38-
processorArchitecture="*"
39-
publicKeyToken="6595b64144ccf1df"
40-
language="*"
41-
/>
42-
</dependentAssembly>
43-
</dependency>
44-
</assembly>
31+
<dependency>
32+
<dependentAssembly>
33+
<assemblyIdentity
34+
type="win32"
35+
name="Microsoft.Windows.Common-Controls"
36+
version="6.0.0.0"
37+
processorArchitecture="*"
38+
publicKeyToken="6595b64144ccf1df"
39+
language="*"
40+
/>
41+
</dependentAssembly>
42+
</dependency>
43+
</assembly>

‎DotnetRuntimeBootstrapper/DotnetRuntimeBootstrapper.Local.props‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" TreatAsLocalProperty="TaskAssembly">
2-
1+
<Project
2+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
3+
ToolsVersion="4.0"
4+
TreatAsLocalProperty="TaskAssembly"
5+
>
36
<Import Project="DotnetRuntimeBootstrapper.props" />
47

58
<!-- Props for local testing, used by the demo projects -->
69
<PropertyGroup>
7-
<TaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)/bin/$(Configuration)/netstandard2.0/DotnetRuntimeBootstrapper.dll</TaskAssembly>
8-
<TaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)/bin/$(Configuration)/net472/DotnetRuntimeBootstrapper.dll</TaskAssembly>
10+
<TaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'"
11+
>$(MSBuildThisFileDirectory)/bin/$(Configuration)/netstandard2.0/DotnetRuntimeBootstrapper.dll</TaskAssembly
12+
>
13+
<TaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'"
14+
>$(MSBuildThisFileDirectory)/bin/$(Configuration)/net472/DotnetRuntimeBootstrapper.dll</TaskAssembly
15+
>
916
</PropertyGroup>
10-
11-
</Project>
17+
</Project>

‎DotnetRuntimeBootstrapper/DotnetRuntimeBootstrapper.csproj‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
54
<IsPackable>true</IsPackable>
@@ -27,12 +26,29 @@
2726
</ItemGroup>
2827

2928
<ItemGroup>
30-
<PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
31-
<PackageReference Include="Microsoft.Build.Framework" Version="17.14.8" PrivateAssets="all" />
32-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.8" PrivateAssets="all" ExcludeAssets="runtime" />
33-
<PackageReference Include="Mono.Cecil" Version="0.11.6" PrivateAssets="all" GeneratePathProperty="true" />
29+
<PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
30+
<PackageReference Include="Microsoft.Build.Framework" Version="17.14.28" PrivateAssets="all" />
31+
<PackageReference
32+
Include="Microsoft.Build.Utilities.Core"
33+
Version="17.14.28"
34+
PrivateAssets="all"
35+
ExcludeAssets="runtime"
36+
>
37+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
38+
</PackageReference>
39+
<PackageReference
40+
Include="Mono.Cecil"
41+
Version="0.11.6"
42+
PrivateAssets="all"
43+
GeneratePathProperty="true"
44+
/>
3445
<PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
35-
<PackageReference Include="Ressy" Version="1.0.3" PrivateAssets="all" GeneratePathProperty="true" />
46+
<PackageReference
47+
Include="Ressy"
48+
Version="1.0.3"
49+
PrivateAssets="all"
50+
GeneratePathProperty="true"
51+
/>
3652
</ItemGroup>
3753

3854
<!-- Non-linking dependency on the apphost projects to ensure correct build order -->
@@ -86,14 +102,25 @@
86102

87103
<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
88104
<ItemGroup>
89-
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths)" TargetPath="%(ReferenceCopyLocalPaths.DestinationSubPath)" />
105+
<BuildOutputInPackage
106+
Include="@(ReferenceCopyLocalPaths)"
107+
TargetPath="%(ReferenceCopyLocalPaths.DestinationSubPath)"
108+
/>
90109
</ItemGroup>
91110
</Target>
92111

93112
<!-- Embed the generated deps.json file inside this package -->
94-
<Target Name="AddBuildDependencyFileToBuiltProjectOutputGroupOutput" BeforeTargets="BuiltProjectOutputGroup" Condition="$(GenerateDependencyFile)">
113+
<Target
114+
Name="AddBuildDependencyFileToBuiltProjectOutputGroupOutput"
115+
BeforeTargets="BuiltProjectOutputGroup"
116+
Condition="$(GenerateDependencyFile)"
117+
>
95118
<ItemGroup>
96-
<BuiltProjectOutputGroupOutput Include="$(ProjectDepsFilePath)" TargetPath="$(ProjectDepsFileName)" FinalOutputPath="$(ProjectDepsFilePath)" />
119+
<BuiltProjectOutputGroupOutput
120+
Include="$(ProjectDepsFilePath)"
121+
TargetPath="$(ProjectDepsFileName)"
122+
FinalOutputPath="$(ProjectDepsFilePath)"
123+
/>
97124
</ItemGroup>
98125
</Target>
99126

@@ -106,9 +133,14 @@
106133

107134
<Target Name="GetDependencyTargetPaths">
108135
<ItemGroup>
109-
<TargetPathWithTargetPlatformMoniker Include="$(PKGMono_Cecil)/lib/$(TargetFramework)/*.dll" IncludeRuntimeDependency="false" />
110-
<TargetPathWithTargetPlatformMoniker Include="$(PKGRessy)/lib/$(TargetFramework)/*.dll" IncludeRuntimeDependency="false" />
136+
<TargetPathWithTargetPlatformMoniker
137+
Include="$(PKGMono_Cecil)/lib/$(TargetFramework)/*.dll"
138+
IncludeRuntimeDependency="false"
139+
/>
140+
<TargetPathWithTargetPlatformMoniker
141+
Include="$(PKGRessy)/lib/$(TargetFramework)/*.dll"
142+
IncludeRuntimeDependency="false"
143+
/>
111144
</ItemGroup>
112145
</Target>
113-
114-
</Project>
146+
</Project>

‎DotnetRuntimeBootstrapper/DotnetRuntimeBootstrapper.props‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" TreatAsLocalProperty="TaskAssembly">
2-
1+
<Project
2+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
3+
ToolsVersion="4.0"
4+
TreatAsLocalProperty="TaskAssembly"
5+
>
36
<PropertyGroup>
4-
<GenerateBootstrapperOnBuild Condition="'$(GenerateBootstrapperOnBuild)' == ''">false</GenerateBootstrapperOnBuild>
7+
<GenerateBootstrapperOnBuild Condition="'$(GenerateBootstrapperOnBuild)' == ''"
8+
>false</GenerateBootstrapperOnBuild
9+
>
510
</PropertyGroup>
611

712
<PropertyGroup>
8-
<TaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)/../tasks/netstandard2.0/DotnetRuntimeBootstrapper.dll</TaskAssembly>
9-
<TaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)/../tasks/net472/DotnetRuntimeBootstrapper.dll</TaskAssembly>
13+
<TaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'"
14+
>$(MSBuildThisFileDirectory)/../tasks/netstandard2.0/DotnetRuntimeBootstrapper.dll</TaskAssembly
15+
>
16+
<TaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'"
17+
>$(MSBuildThisFileDirectory)/../tasks/net472/DotnetRuntimeBootstrapper.dll</TaskAssembly
18+
>
1019
</PropertyGroup>
1120

1221
<UsingTask TaskName="DotnetRuntimeBootstrapper.BootstrapperTask" AssemblyFile="$(TaskAssembly)" />
13-
14-
</Project>
22+
</Project>

0 commit comments

Comments
 (0)