mirror of
https://github.com/Cheviiot/Vintner.git
synced 2026-08-04 00:07:24 +00:00
Build old (pre-v145) PlatformToolset-pinned .vcxproj files
vintner only ever downloads one compiler generation, but real-world .vcxproj files are pinned to whichever PlatformToolset they were last saved under - v142 (VS2019) for anything not actively maintained is extremely common. MSBuild checks toolset "installed-ness" (MSB8020) by testing whether MSBuild/Microsoft/VC/v<schema>/Platforms/<arch>/ PlatformToolsets/<toolset>/ exists on disk - a plain file lookup our downloaded MSBuild package only satisfies for the exact generation it shipped. `install` now symlinks every historical numeric PlatformToolset name (v90 through v143) onto whichever real toolset directory is actually present, so any of them resolves transparently; Toolset.props/ .targets don't hardcode a version number, so aliasing is correct, not just a workaround. Three more MSBuild property/environment issues came with it, all found building a real years-old project against the one modern toolchain vintner installs: - VCInstallDir_<N>/VCToolsInstallDir_<N> needed a third numbering source (PlatformToolset short names from Microsoft.VCToolsVersion. v<N>.default.props) alongside the existing MSBuild schema-version and known-toolset lists, so the env-var-driven half of toolset resolution covers the same names the on-disk alias does. - VCToolsVersion must be a real version string: left unset, it falls back to a literal placeholder that then hits an unconditional version-string comparison elsewhere in Microsoft.CppBuild.targets (MSB4184). Setting it to the real installed version in turn requires CheckMSVCComponents=false, since CheckVCToolsetVersion (MSB8052) otherwise rejects an aliased PlatformToolset whenever its numeric generation doesn't match VCToolsVersion's - exactly the case aliasing creates on purpose. Everything else CheckMSVCComponents gates is diagnostic-only (MFC/ATL/Spectre presence warnings), so disabling it costs nothing else. - WindowsTargetPlatformVersion needed to become an explicit /p: global property on the msbuild command line, not just an env var: legacy .vcxproj files commonly hardcode this in a PropertyGroup, and an explicit project assignment always wins over an inherited environment variable of the same name. A command-line global property is the one thing a project file can't override. Only injected when the caller hasn't already pinned it themselves.
This commit is contained in:
@@ -39,6 +39,14 @@ func TestMsbuildEnvBasics(t *testing.T) {
|
||||
if env["DisableRegistryUse"] != "true" {
|
||||
t.Errorf(`env["DisableRegistryUse"] = %q, want "true"`, env["DisableRegistryUse"])
|
||||
}
|
||||
if env["CheckMSVCComponents"] != "false" {
|
||||
t.Errorf(`env["CheckMSVCComponents"] = %q, want "false" (else CheckVCToolsetVersion errors on an aliased PlatformToolset)`, env["CheckMSVCComponents"])
|
||||
}
|
||||
// VCToolsVersion must be a real version string (see msbuildEnv's doc
|
||||
// comment on it: leaving it unset makes Microsoft.Cpp.VCTools.props
|
||||
// substitute a placeholder that then breaks unconditional version
|
||||
// comparisons elsewhere). CheckMSVCComponents=false is what keeps this
|
||||
// safe to combine with an aliased PlatformToolset.
|
||||
if env["VCToolsVersion"] != cfg.MSVCVer {
|
||||
t.Errorf(`env["VCToolsVersion"] = %q, want %q`, env["VCToolsVersion"], cfg.MSVCVer)
|
||||
}
|
||||
@@ -61,7 +69,24 @@ func TestMsbuildEnvDiscoversEveryToolsetVersion(t *testing.T) {
|
||||
cfg := &wineenv.Config{Arch: "x64", Host: "x64", DotnetHost: "amd64", MSVCVer: "14.51.36231", SDKVer: "10.0.26100.0"}
|
||||
paths, base := newTestPaths(t, cfg)
|
||||
|
||||
for _, v := range []string{"v145", "v180", "not-a-version"} {
|
||||
// Real layout has two independent sources feeding VCInstallDir_<N>/
|
||||
// VCToolsInstallDir_<N> (see toolsetSuffixes' doc comment for why both
|
||||
// are needed): the PlatformToolset short names a downloaded compiler
|
||||
// ships default-props for, and MSBuild's own fixed schema-version dirs.
|
||||
buildDir := filepath.Join(base, "vc", "Auxiliary", "Build")
|
||||
if err := os.MkdirAll(buildDir, 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, name := range []string{
|
||||
"Microsoft.VCToolsVersion.v145.default.props",
|
||||
"Microsoft.VCToolsVersion.v143.default.props",
|
||||
"Microsoft.VCToolsVersion.default.props", // no version suffix - must not match
|
||||
} {
|
||||
if err := os.WriteFile(filepath.Join(buildDir, name), nil, 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
for _, v := range []string{"v180", "not-a-version"} {
|
||||
if err := os.MkdirAll(filepath.Join(base, "MSBuild", "Microsoft", "VC", v), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -69,7 +94,7 @@ func TestMsbuildEnvDiscoversEveryToolsetVersion(t *testing.T) {
|
||||
|
||||
env := msbuildEnv(cfg, paths)
|
||||
|
||||
for _, n := range []string{"145", "180"} {
|
||||
for _, n := range []string{"145", "143", "180"} {
|
||||
if _, ok := env["VCInstallDir_"+n]; !ok {
|
||||
t.Errorf("expected VCInstallDir_%s to be set", n)
|
||||
}
|
||||
@@ -82,6 +107,64 @@ func TestMsbuildEnvDiscoversEveryToolsetVersion(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestToolsetSuffixesDedupsOverlap(t *testing.T) {
|
||||
base := t.TempDir()
|
||||
buildDir := filepath.Join(base, "vc", "Auxiliary", "Build")
|
||||
if err := os.MkdirAll(buildDir, 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(buildDir, "Microsoft.VCToolsVersion.v180.default.props"), nil, 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Join(base, "MSBuild", "Microsoft", "VC", "v180"), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
got := toolsetSuffixes(base)
|
||||
count := 0
|
||||
for _, n := range got {
|
||||
if n == "180" {
|
||||
count++
|
||||
}
|
||||
}
|
||||
if count != 1 {
|
||||
t.Errorf("toolsetSuffixes() returned %q with %d entries for \"180\" (from both sources), want exactly 1", got, count)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMsbuildGlobalArgsForcesWindowsTargetPlatformVersion(t *testing.T) {
|
||||
cfg := &wineenv.Config{SDKVer: "10.0.26100.0"}
|
||||
|
||||
got := msbuildGlobalArgs(cfg, []string{"Foo.sln", "/p:Configuration=Release"})
|
||||
want := "/p:WindowsTargetPlatformVersion=10.0.26100.0"
|
||||
found := false
|
||||
for _, a := range got {
|
||||
if a == want {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Errorf("msbuildGlobalArgs(...) = %v, want it to contain %q", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMsbuildGlobalArgsRespectsExplicitOverride(t *testing.T) {
|
||||
cfg := &wineenv.Config{SDKVer: "10.0.26100.0"}
|
||||
|
||||
for _, explicit := range []string{
|
||||
"/p:WindowsTargetPlatformVersion=10.0.19041.0",
|
||||
"-p:WindowsTargetPlatformVersion=10.0.19041.0",
|
||||
"/property:WindowsTargetPlatformVersion=10.0.19041.0",
|
||||
} {
|
||||
got := msbuildGlobalArgs(cfg, []string{"Foo.sln", explicit})
|
||||
for _, a := range got {
|
||||
if reGlobalProp("WindowsTargetPlatformVersion").MatchString(a) {
|
||||
t.Errorf("msbuildGlobalArgs with explicit %q also injected %q - should have left the caller's value alone", explicit, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMsbuildEnvDetectsWDKContentRoot(t *testing.T) {
|
||||
cfg := &wineenv.Config{Arch: "x64", Host: "x64", DotnetHost: "amd64", MSVCVer: "14.51.36231", SDKVer: "10.0.26100.0"}
|
||||
paths, base := newTestPaths(t, cfg)
|
||||
|
||||
Reference in New Issue
Block a user