File tree Expand file tree Collapse file tree 2 files changed +4
-19
lines changed
src/Installer/redist-installer/targets Expand file tree Collapse file tree 2 files changed +4
-19
lines changed Original file line number Diff line number Diff line change 193
193
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
194
194
then use that in Directory.Packages.props.
195
195
196
- At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
196
+ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
197
+
198
+ Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
197
199
<MicrosoftBuildVersion >17.12.7</MicrosoftBuildVersion >
198
200
<MicrosoftBuildLocalizationVersion >17.12.7-preview-24522-03</MicrosoftBuildLocalizationVersion >
199
201
<MicrosoftBuildMinimumVersion Condition =" '$(DotNetBuildSourceOnly)' != 'true'" >17.11.4</MicrosoftBuildMinimumVersion >
202
+ <MinimumVSVersion >17.12</MinimumVSVersion >
200
203
</PropertyGroup >
201
204
<PropertyGroup >
202
205
<!-- Dependencies from https://github.com/dotnet/templating -->
Original file line number Diff line number Diff line change 285
285
Overwrite =" true" />
286
286
</Target >
287
287
288
- <Target Name =" GetMinimumVSVersion"
289
- BeforeTargets =" GenerateSdkBundle"
290
- Condition =" '$(OS)' == 'Windows_NT' "
291
- Outputs =" $(MinimumVSVersion)" >
292
- <PropertyGroup >
293
- <MinimumMSBuildVersionFile Condition =" $([System.Text.RegularExpressions.Regex]::Match(%(SDKInternalFiles.Identity),'.*minimumMSBuildVersion').Success) " >%(SDKInternalFiles.Identity)</MinimumMSBuildVersionFile >
294
- </PropertyGroup >
295
-
296
- <ReadLinesFromFile File =" $(MinimumMSBuildVersionFile)" >
297
- <Output TaskParameter =" Lines" PropertyName =" MinimumVSVersion" />
298
- </ReadLinesFromFile >
299
-
300
- <PropertyGroup Condition =" '$(VersionSDKMinor)' == '1' and '$(StabilizePackageVersion)' == 'true' " >
301
- <MinimumVSVersion >$(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.'))))</MinimumVSVersion >
302
- <MinimumVSVersion >$([MSBuild]::Add($(MinimumVSVersion), .1))</MinimumVSVersion >
303
- </PropertyGroup >
304
- </Target >
305
-
306
288
<Target Name =" GenerateSdkBundle"
307
289
DependsOnTargets =" GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi;GenerateTemplatesMsis;GenerateWorkloadManifestsWxs"
308
290
Condition =" '$(OS)' == 'Windows_NT' "
You can’t perform that action at this time.
0 commit comments