Skip to content

upgrade to net6.0 version + add explicit apphost loading for specific platforms #224

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

Closed
YuliiaKovalova wants to merge 7 commits into from
Closed

upgrade to net6.0 version + add explicit apphost loading for specific platforms #224

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
60cb8cc
upgrade netcore version + add explicit apphost loading for specific p…
YuliiaKovalova Jul 31, 2023
1166b2a
downgrade sdk version
YuliiaKovalova Jul 31, 2023
9db5fb6
upgrate sdk version for tests
YuliiaKovalova Jul 31, 2023
57665c4
fix formatting
YuliiaKovalova Jul 31, 2023
07c1274
fix review comment
YuliiaKovalova Jul 31, 2023
a76e660
fix review comments
YuliiaKovalova Aug 1, 2023
a7e81c9
fix invalid package name
YuliiaKovalova Aug 1, 2023
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 samples/BuilderApp/BuilderApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\MSBuildLocator\key.snk</AssemblyOriginatorKeyFile>
Expand Down
23 changes: 19 additions & 4 deletions src/MSBuildLocator/Microsoft.Build.Locator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net46;net6.0</TargetFrameworks>
<DebugType>full</DebugType>

<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AssemblyName>Microsoft.Build.Locator</AssemblyName>
<RootNamespace>Microsoft.Build.Locator</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand All @@ -25,6 +25,21 @@
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-bionic-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.linux-bionic-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
<Content Include="build\Microsoft.Build.Locator.props">
Expand All @@ -42,5 +57,5 @@
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
</ItemGroup>

</Project>
</Project>