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

Merge branch 'main' of https://github.com/dotnet/installer into TestProjectValidation

Browse source
This commit is contained in:
Jackson Schuster 2024-03-27 15:41:33 -07:00
commit 3981f8be75
6 changed files with 41 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
eng/Version.Details.xml
View file

@ -5,21 +5,21 @@
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
-->
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.4.24176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.4.24177.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c805f1d0fd42909046af661edb02bcf1428ff304</Sha>
<Sha>e9216a8057d1837fc2344fa36703ae8f9b49cc24</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24177.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c805f1d0fd42909046af661edb02bcf1428ff304</Sha>
<Sha>e9216a8057d1837fc2344fa36703ae8f9b49cc24</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24177.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c805f1d0fd42909046af661edb02bcf1428ff304</Sha>
<Sha>e9216a8057d1837fc2344fa36703ae8f9b49cc24</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24176.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24177.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c805f1d0fd42909046af661edb02bcf1428ff304</Sha>
<Sha>e9216a8057d1837fc2344fa36703ae8f9b49cc24</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24176.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -91,26 +91,26 @@
<Sha>63c8031b6a6af5009b3c5bb4291fcc4c32b06b10</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24177.2">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24177.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1d212f88bd92e3257fea744aba7199f872ee4989</Sha>
<Sha>f4c11814251c66b510761dee510b9b16c956fe50</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24177.2">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24177.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1d212f88bd92e3257fea744aba7199f872ee4989</Sha>
<Sha>f4c11814251c66b510761dee510b9b16c956fe50</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24177.2">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24177.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1d212f88bd92e3257fea744aba7199f872ee4989</Sha>
<Sha>f4c11814251c66b510761dee510b9b16c956fe50</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24177.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24177.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1d212f88bd92e3257fea744aba7199f872ee4989</Sha>
<Sha>f4c11814251c66b510761dee510b9b16c956fe50</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24177.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24177.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1d212f88bd92e3257fea744aba7199f872ee4989</Sha>
<Sha>f4c11814251c66b510761dee510b9b16c956fe50</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
@ -144,13 +144,13 @@
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.3.24168.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.4.24176.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>e59c8abcf6e29b8b99a2efefec4133b1f94559af</Sha>
<Sha>9c9b2e06a998f65638053fdd32cbd65c4cd1a64f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.3.24168.12" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24177.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>6ffdf5ca7bdc28496c8b5533277705fba66483f4</Sha>
<Sha>9ef9cfb01e493f617202fd47a09c3403327933a4</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24175.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>

18
eng/Versions.props
View file

@ -47,11 +47,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.3.24168.11</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24176.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.3.24168.12</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24177.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -80,9 +80,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24177.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24177.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24177.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24177.10</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24177.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24177.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -106,10 +106,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24176.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24176.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24176.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24176.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24177.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24177.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24177.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24177.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->

4
eng/pipelines/templates/variables/vmr-build.yml
View file

@ -45,7 +45,7 @@ variables:
- name: poolImage_Mac
value: macos-12
- name: poolImage_Windows
value: windows.vs2022.amd64.open
value: windows.vs2022preview.amd64.open
- ${{ else }}:
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- name: defaultPoolName
@ -62,4 +62,4 @@ variables:
- name: poolImage_Mac
value: macos-13-arm64
- name: poolImage_Windows
value: windows.vs2022.amd64
value: windows.vs2022preview.amd64

24
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs
View file

@ -107,31 +107,7 @@ public class LicenseScanTests : TestBase
private static readonly string[] s_ignoredFilePatterns = new string[]
{
"*.bin",
"*.bmp",
"*.bson",
"*.db",
"*.dic",
"*.eot",
"*.gif",
"*.ico",
"*.jpg",
"*.il",
"*.ildump",
"*.lss",
"*.nlp",
"*.otf",
"*.pdf",
"*.pfx",
"*.png",
"*.snk",
"*.ttf",
"*.vsd",
"*.vsdx",
"*.winmd",
"*.woff",
"*.woff2",
"*.xlsx",
};
private readonly string _targetRepo;

7
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt
View file

@ -274,13 +274,6 @@ src/vstest/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgs
src/vstest/src/package/Microsoft.CodeCoverage/ThirdPartyNoticesCodeCoverage.txt
src/vstest/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf
#
# winforms
#
# ISSUE: Winforms repo bringing in a non-open source license (https://github.com/dotnet/source-build/issues/3772)
src/winforms/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/LICENSE.txt
#
# wpf
#

10
src/VirtualMonoRepo/source-mappings.json
View file

@ -167,7 +167,9 @@
"defaultRemote": "https://github.com/microsoft/vstest",
"exclude": [
// Non-OSS license used in VS specific build configurations.
"src/package/licenses/LICENSE_VS.txt"
// Non-OSS license - https://github.com/dotnet/source-build/issues/4255
"src/package/licenses/LICENSE_VS.txt",
"test/Microsoft.TestPlatform.CoreUtilities.UnitTests/TestAssets/dotnetWinX86.exe"
]
},
{
@ -186,7 +188,11 @@
},
{
"name": "winforms",
"defaultRemote": "https://github.com/dotnet/winforms"
"defaultRemote": "https://github.com/dotnet/winforms",
"exclude": [
// Non-OSS license - https://github.com/dotnet/source-build/issues/3772
"src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/**"
]
},
{
"name": "wpf",