No commit message

fsmoke · Oct 2, 2019 · fcdc7d3 · fcdc7d3
1 parent 28014e6
commit fcdc7d3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/Setup.iss b/Setup.iss
@@ -29,7 +29,8 @@ WizardSmallImageFile=WIFISmall.bmp
 Name: english; MessagesFile: compiler:Default.isl
 
 [Files]
-Source: _Distrib\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: Distrib\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: Temp\bin\ESP8266Wizard\Release\ESP8266Wizard.vsix; DestDir: {app}; Flags: ignoreversion
 
 [Run]
 
@@ -219,4 +220,3 @@ begin
 	Result:= True;
 end;
 
-
diff --git a/Sources/ESP8266ClassWizard/ESP8266ClassWizard.vcxproj b/Sources/ESP8266ClassWizard/ESP8266ClassWizard.vcxproj
@@ -76,17 +76,25 @@
     <LinkIncremental>true</LinkIncremental>
     <LinkKeyFile>$(RootNamespace).snk</LinkKeyFile>
     <LinkDelaySign>true</LinkDelaySign>
+    <IntDir>..\..\Temp\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>..\..\Temp\bin\$(ProjectName)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <IntDir>..\..\Temp\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>..\..\Temp\bin\$(ProjectName)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <LinkKeyFile>$(RootNamespace).snk</LinkKeyFile>
     <LinkDelaySign>true</LinkDelaySign>
+    <IntDir>..\..\Temp\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>..\..\Temp\bin\$(ProjectName)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <IntDir>..\..\Temp\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>..\..\Temp\bin\$(ProjectName)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/Sources/ESP8266Template/ESP8266Template.csproj b/Sources/ESP8266Template/ESP8266Template.csproj
@@ -61,7 +61,9 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\Temp\bin\ESP8266Template\Debug\</OutputPath>
+	<BaseOutputPath>..\..\Temp\bin\ESP8266Template\Debug\</BaseOutputPath>
+	<BaseIntermediateOutputPath>..\..\Temp\ESP8266Template\</BaseIntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -70,7 +72,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\Temp\bin\ESP8266Template\Release\</OutputPath>
+	<BaseOutputPath>..\..\Temp\bin\ESP8266Template\Release\</BaseOutputPath>
+	<BaseIntermediateOutputPath>..\..\Temp\ESP8266Template\</BaseIntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/Sources/ESP8266Wizard/ESP8266Wizard.csproj b/Sources/ESP8266Wizard/ESP8266Wizard.csproj
@@ -42,20 +42,30 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\Temp\bin\ESP8266Wizard\Debug\</OutputPath>
+	<BaseOutputPath>..\..\Temp\bin\ESP8266Wizard\Debug\</BaseOutputPath>
+	<BaseIntermediateOutputPath>..\..\Temp\ESP8266Wizard\</BaseIntermediateOutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
+    <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>
+    <CopyVsixExtensionLocation>
+    </CopyVsixExtensionLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+	<OutputPath>..\..\Temp\bin\ESP8266Wizard\Release\</OutputPath>
+	<BaseOutputPath>..\..\Temp\bin\ESP8266Wizard\Release\</BaseOutputPath>
+	<BaseIntermediateOutputPath>..\..\Temp\ESP8266Wizard\</BaseIntermediateOutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
+    <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>
+    <CopyVsixExtensionLocation>
+    </CopyVsixExtensionLocation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -87,6 +97,10 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">