NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit3f42446

authored

Merge pull requestdotnet#4406 from brettfo/propertypages-packagereference

convert FSharp.PropertyPages to use PackageReference

2 parentsa50f4c5 +e0ce4a4 commit3f42446Copy full SHA for 3f42446

File tree

20 files changed

+24

-200

lines changed

build/targets
- PackageVersions.props
vsintegration
- fsharp-vsintegration-src-build.proj
- src
  - Directory.Build.props
  - Directory.Build.targets
  - FSharp.LanguageService.Base
    - Directory.Build.props
    - Directory.Build.targets
  - FSharp.LanguageService
    - Directory.Build.props
    - Directory.Build.targets
  - FSharp.ProjectSystem.Base/Project
  - FSharp.ProjectSystem.FSharp
    - Directory.Build.props
    - Directory.Build.targets
  - FSharp.ProjectSystem.PropertyPages
    - AssemblyInfo.vb
    - FSharp.PropertiesPages.vbproj
    - PropertyPages
      - ApplicationPropPage.vb
  - FSharp.UIResources
    - Directory.Build.props
    - Directory.Build.targets
  - FSharp.VS.FSI
    - Directory.Build.props
    - Directory.Build.targets

20 files changed

+24

-200

lines changed

`‎build/targets/PackageVersions.props‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>`
`20`	`20`	`<MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>15.0.26201</MicrosoftVisualStudioLanguageStandardClassificationPackageVersion>`
`21`	`21`	`<MicrosoftVisualStudioLanguageIntellisensePackageVersion>15.0.26201</MicrosoftVisualStudioLanguageIntellisensePackageVersion>`
	`22`	`+ <MicrosoftVisualStudioManagedInterfacesPackageVersion>8.0.50727</MicrosoftVisualStudioManagedInterfacesPackageVersion>`
`22`	`23`	`<MicrosoftVisualStudioPackageLanguageService150PackageVersion>15.0.26201</MicrosoftVisualStudioPackageLanguageService150PackageVersion>`
`23`	`24`	`<MicrosoftVisualStudioProjectAggregatorPackageVersion>8.0.50727</MicrosoftVisualStudioProjectAggregatorPackageVersion>`
`24`	`25`	`<MicrosoftVisualStudioShell140PackageVersion>14.3.25407</MicrosoftVisualStudioShell140PackageVersion>`
`@@ -33,10 +34,12 @@`
`33`	`34`	`<MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>`
`34`	`35`	`<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>`
`35`	`36`	`<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>`
	`37`	`+ <MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>`
`36`	`38`	`<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>`
`37`	`39`	`<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>`
`38`	`40`	`<VSSDKVSLangProjPackageVersion>7.0.4</VSSDKVSLangProjPackageVersion>`
`39`	`41`	`<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>`
	`42`	`+ <VSSDKVSLangProj11PackageVersion>11.0.4</VSSDKVSLangProj11PackageVersion>`
`40`	`43`	`<VSSDKVSHelpPackageVersion>7.0.4</VSSDKVSHelpPackageVersion>`
`41`	`44`
`42`	`45`	`<!-- other packages-->`

`‎vsintegration/fsharp-vsintegration-src-build.proj‎`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,20 +16,10 @@`
`16`	`16`	`<ProjectFilesInclude="src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />`
`17`	`17`	`</ItemGroup>`
`18`	`18`
`19`		`- <ItemGroup>`
`20`		`- <SdkProjectsInclude="src\FSharp.Editor\FSharp.Editor.fsproj" />`
`21`		`- <SdkProjectsInclude="src\FSharp.LanguageService\FSharp.LanguageService.fsproj" />`
`22`		`- <SdkProjectsInclude="src\FSharp.UIResources\FSharp.UIResources.csproj" />`
`23`		`- <SdkProjectsInclude="src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj" />`
`24`		`- <SdkProjectsInclude="src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj" />`
`25`		`- <SdkProjectsInclude="src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj" />`
`26`		`- <SdkProjectsInclude="src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj" />`
`27`		`- </ItemGroup>`
`28`		`-`
`29`	`19`	`<ImportProject="..\src\root.traversal.targets"/>`
`30`	`20`
`31`	`21`	`<TargetName="Restore">`
`32`		`- <MSBuildProjects="@(SdkProjects)"Targets="Restore" />`
	`22`	`+ <MSBuildProjects="@(ProjectFiles)"Targets="Restore" />`
`33`	`23`	`</Target>`
`34`	`24`
`35`	`25`	`</Project>`