mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'feature/installer-merge-update-main' into feature/installer-merge-update

Browse source 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	global.json
#	src/redist/targets/Crossgen.targets
#	src/redist/targets/GenerateBundledVersions.targets
#	src/redist/targets/GenerateLayout.targets
#	src/redist/targets/GenerateMSIs.targets
This commit is contained in:
Michael Yanni 2024-01-29 14:04:18 -08:00
commit 69787b8b88
193 changed files with 3492 additions and 3317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/SdkTests/SdkTests.csproj
View file

@ -61,7 +61,7 @@
<RuntimeVersionToInstall Include="5.0.0" />
<RuntimeVersionToInstall Include="6.0.0" />
<RuntimeVersionToInstall Include="7.0.0" />
<RuntimeVersionToInstall Include="8.0.0-rc.2.23479.6" />
<RuntimeVersionToInstall Include="8.0.0" />
</ItemGroup>
</Target>

4
test/SdkTests/TestConfig.xml
View file

@ -257,5 +257,9 @@
Skip="true"
Issue=""
Reason="Requires props file not in installer repo"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
</SkippedTests>
</Tests>